Issue #4294: Fix bugs for MoonWarriors JSB
Issue #4294: Merged Fix bugs for MoonWarriors JSB
Issue #4294: Merged
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

Conflicts:
	samples/js-moonwarriors/project/proj.win32/js-moonwarriors.vcxproj.user
	samples/js-moonwarriors/src/Background.js
	samples/js-moonwarriors/src/Bullet.js
	samples/js-moonwarriors/src/Enemy.js
	samples/js-moonwarriors/src/Explosion.js
	samples/js-moonwarriors/src/HitEffect.js
	samples/js-moonwarriors/src/Ship.js
Issue #4294: MoonWarriors JSB fix audio overlap issue
Merge commit 'refs/pull/170/head' of git://github.com/cocos2d/cocos2d-js
Updates cocos2d-x.
Merge pull request #172 from dumganhar/master

Merge PR https://github.com/cocos2d/cocos2d-js/pull/170