GitLab

Conflicts:
	kmail/job/createtaskjob.cpp
	pimsettingexporter/mail/exportmailjob.h

Conflicts:
	CMakeLists.txt

Everything works fine with kdelibs 4, closing the window and
leaving the app running for the systray icon, quitting via window or
quitting via systray, etc.

The erroneous message was displayed too soon when default calendar
collections had to be created. The message is now displayed only
after any calendar migration has finished and any new collections
created.

Conflicts:
	CMakeLists.txt

Conflicts:
	CMakeLists.txt
	agents/folderarchiveagent.desktop
	agents/folderarchiveagent/akonadi_folderarchive_agent.notifyrc
	messageviewer/notify/messageviewer.notifyrc

Conflicts:
	sieveeditor/sieveeditormainwindow.cpp