Merge branch 'Applications/14.12' into frameworks

Merge branch 'Applications/14.12' into frameworks

Conflicts:
	dolphin/src/main.cpp
	kdepasswd/kcm/kcm_useraccount.desktop
	konqueror/settings/ebrowsing/ebrowsing.desktop
	konqueror/settings/kio/cache.desktop
	konqueror/settings/kio/cookies.desktop
	konqueror/settings/kio/netpref.desktop
	konqueror/settings/kio/proxy.desktop
	konqueror/settings/kio/smb.desktop
	konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop
	konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop
	konqueror/settings/kio/useragent.desktop
	lib/konq/konq_operations.cpp