Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	libksieve/ksieveui/scriptsparsing/xmlprintingsyntaxhighlighter.cpp
	mailcommon/filter/filteractions/filteraction.h
	mailcommon/filter/filterimporter/filterimporterabstract.cpp
	mailcommon/filter/kmfilterlistbox.cpp
	messageviewer/adblock/adblocksyntaxhighlighter.cpp
	mobile/mail/mainview.cpp
	pimcommon/syntaxhighlighter/syntaxhighlighterbase.h
	templateparser/templatessyntaxhighlighter.cpp

antispam-virus/antispamwizard.cpp

@@ -42,8 +42,8 @@
 #include "pimcommon/imapresourcesettings.h"
 #include "mailcommon/kernel/mailkernel.h"
 #include "mailcommon/filter/mailfilter.h"
-#include "mailcommon/filter/filteraction.h"
-#include "mailcommon/filter/filteractiondict.h"
+#include "mailcommon/filter/filteractions/filteraction.h"
+#include "mailcommon/filter/filteractions/filteractiondict.h"
 #include "mailcommon/filter/filtermanager.h"
 
 #include "pimcommon/util/pimutil.h"

kmcommands.cpp

@@ -72,7 +72,7 @@
 
 #include "messagecore/misc/mailinglist.h"
 #include "editor/composer.h"
-#include "mailcommon/filter/filteraction.h"
+#include "mailcommon/filter/filteractions/filteraction.h"
 #include "mailcommon/filter/filtermanager.h"
 #include "mailcommon/filter/mailfilter.h"
 #include "mailcommon/widgets/redirectdialog.h"