update submodule
Merge pull request #159 from dumganhar/master

If not pass a target to android-build.py, exit 1.
Merge pull request #160 from lihex/master

update submodule
Fixed #4277: update the reference of cocos2d-html5
Merge pull request #161 from dumganhar/master

Updates jsb_cocos2d_constants.js, adds cc.ONE, cc.ZERO, ...
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Merge pull request #162 from dingpinglv/Iss4277_ReleaseV3.0

Fixed #4277: update the reference of cocos2d-html5
Issue #4294: Fix bugs for MoonWarriors JSB
Merge pull request #163 from dumganhar/master

Updates win32 project, fix CL.exe was used by another process.
Merge pull request #164 from dumganhar/master

testjs.ico -> js-tests.ico.
Merge pull request #165 from dumganhar/master

js-tests.user -> js-tests.vcxproj.user
Merge pull request #169 from dumganhar/master

Moonwarriors works on Win32.
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.