fixes for jsb
Merge remote-tracking branch 'origin/master'

Conflicts:
	LoriFight/src/GameScene.js