Merge remote-tracking branch 'upstream/master' into wizard

Conflicts:
	CMakeLists.txt
	components/config/gamesettings.cpp
Post-merge cleanups, using confignmanager for XDG paths now, thanks scrawl!