fixade lite buggar
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt
lol
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/MapHandler.cpp
	GameClient/ServerThread.cpp
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt