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

Conflicts:
	Dedicated Server/Bin/x86/WorldObjects.cfg