gui stuff
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameClient.vcxproj.filters
	GameClient/GameState.cpp
	GameClient/STATISTICSlastgame.txt
	GameClient/ServerThread.cpp
	GameClient/Skill.h