commit for merge
Merge branch 'master' of github.com:Vrixyz/CodeA

Conflicts:
	src/MasterServer/client_test/GamesWindow.cpp
	src/MasterServer/client_test/GamesWindow.h