Don't hate the player, hate the game
Merge branch 'master' of https://github.com/Tchaokko/babel

Conflicts:
	loginscreen/HandleProtocol.cpp
	loginscreen/loginscreen.vcxproj.filters
bad commit
Merge branch 'master' of https://github.com/Tchaokko/babel