Fixes

Signed-off-by: Alexander Ivannikov <Alexivan_91@hotmail.com>
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	Server/Server/Source/ActorSynchronizer.cpp
	Server/Server/Source/AnimalActor.cpp
	Server/Server/Source/BioActor.cpp
	Server/Server/Source/BioActor.h
	Server/Server/Source/ObjectManager.cpp
	Server/Server/Source/PlayerActor.cpp

Signed-off-by: Alexander Ivannikov <Alexivan_91@hotmail.com>