Improved Collisions

Its not 100% yet. Will fix it later.
Merge branch 'master' of https://github.com/Malow/NotDeadYet

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