commenting and minor fixes
Merge branch 'develop' of https://github.com/mrwinton/TheExcellentAdventure into develop
minor server changes
remove double method in server
Merge branch 'develop' of https://github.com/mrwinton/TheExcellentAdventure into develop