fix a couple bugs; hopefully freezing stare
unit: add isMainPlayer, fix some checks
Merge branch 'master' into banks

Conflicts:
	src/client/game/js/Game/Fighter.js
	src/client/game/js/Game/Player.js