changes to deer, is not done yet.
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Client/Source/Client.cpp
	Server/GUI/Server GUI.csproj
	Server/Server/Source/Game.cpp