fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	PandaJump/.idea/libraries/cocos2d_html5.xml
	PandaJump/.idea/workspace.xml
	PandaJump/src/GameScene.js