Fixes and Additions to prepare for reset
Merged WorldManager with GameServer
Minor bug.
Merge branch 'develop' into develop_shooter2