Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/panels/places/placesitemmodel.cpp
	kdepasswd/kcm/CMakeLists.txt [deleted in frameworks]
	kdepasswd/kcm/main.cpp [deleted in frameworks]

diff --cc src/panels/information/pixmapviewer.cpp
Simple merge

diff --cc src/settings/kcm/kcmdolphingeneral.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinnavigation.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinservices.desktop
Simple merge

diff --cc src/settings/kcm/kcmdolphinviewmodes.desktop
Simple merge