Merge pull request #779 from dingpinglv/develop

Merge develop to master branch
Merge pull request #782 from dingpinglv/develop

Merge develop to master branch
Feature #5929: Refactor moon warriors with require.js
add testcase for query
issue #5932: add bindings for cpSegmentQuery and cp.Space.prototype.segmentQueryFirst
issue #5932: add bindings for cpNearestPointQueryInfo and cp.Space.prototype.nearestPointQueryNearest
issue #5932: add safe guard for unroot and fix args processing bugs
Merge branch 'chipmunk' of https://github.com/joshuastray/cocos2d-js into chipmunk
query test compatible with touch event and convert tab to 4 spaces
Merge pull request #796 from joshuastray/chipmunk

issue #5932: add bindings and a testcase for query of chipmunk
Merge pull request #797 from go3k/develop

Update README.md, add submodule update command suggestion
Feature #5676: Add new assets and upgrade resolution of MoonWarriors
Feature #5676: Add new assets and polish the game
Feature #5676: Fix blend func issue for WebGL
read config.json may failed caused by syntax error
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #798 from cocoscodeide/develop

read config.json may failed caused by syntax error
Fixed #5949: Add type check in cc.loader
Fixed #5949: Add type check in cc.loader
Activate native keyboard for moon warriors