Not many changes.
Merge branch 'master' of https://github.com/Malow/NotDeadYet

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

Conflicts:
	Server/Server/Source/PlayerHumanBehavior.cpp
Small changes to how the health display is handled
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/GUI/Server GUI.csproj