Clenaups
Merge branch 'master' into multiplayer

Conflicts:
	src/common/Menu/CMainMenu.cpp