fixed some namespace related bugs
see prev
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/js/game/game.js
Merge branch 'master' of https://github.com/Osherz5/PancakeStory