Minor changes to later implement jumping
change in server properties
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/Server/Source/Game.cpp
Merge branch 'master' of https://github.com/Malow/NotDeadYet
Nothing major
Merge branch 'master' of https://github.com/Malow/NotDeadYet
Some changes to the deer
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/GUI/Server GUI.csproj
	Server/Server/Source/AIDeerBehavior.cpp
	Server/Server/Source/PlayerHumanBehavior.cpp
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/GUI/Server GUI.csproj