Cursor and server
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameClient.vcxproj.filters
	GameClient/ServerEntity.cpp
	GameClient/ServerEntity.h