stuff
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/GUI/Server GUI.csproj
	Server/Server/Source/Game.cpp
Small changes to allow animals to work on the larger map, still testing.
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/GUI/Server GUI.csproj
	Server/Server/Source/Game.cpp
Smaller changes,
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/GUI/Server GUI.csproj
	Server/Server/Source/PlayerHumanBehavior.cpp
Changes to allow possession of creatures.
Merge branch 'master' of https://github.com/Malow/NotDeadYet

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

Conflicts:
	Server/GUI/Server GUI.csproj
	Server/Server/Source/Game.cpp
Some stuff
Merge branch 'master' of https://github.com/Malow/NotDeadYet