Fixed Supply behavior, have to commit to pull
Merge branch 'master' of https://github.com/Malow/NotDeadYet

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