missing reference to 'this'
Merge branch 'develop' of https://github.com/ironbane/IronbaneServer into develop_unitlist_object

Conflicts:
	src/client/game/js/ng/services/game.js