Merge branch '2.0'

Conflicts:
	ChangeLog
	discover/main.cpp
	discover/muon-contenttheme/metadata.desktop
	installer/main.cpp
	libmuon/backends/ApplicationBackend/muon-applications-backend.desktop
	libmuon/backends/BodegaBackend/muon-bodegawallpapers-backend.desktop
	libmuon/backends/KNSBackend/muon-knscomics-backend.desktop
	libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop
	muon/main.cpp
	updater/main.cpp