Merge pull request #779 from dingpinglv/develop

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

Merge develop to master branch
Fixed #5943: Fix issue about return value of cc.textureCache.addImage
Fix an issue in ParticleSystem test case
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
add testcase for query
issue #5932: add bindings for cpSegmentQuery and cp.Space.prototype.segmentQueryFirst
Update the reference of submodule cocos2d-console.
Merge pull request #793 from pandamicro/develop

Fixed #5943: Fix issue about return value of cc.textureCache.addImage
Merge pull request #795 from natural-law/develop

Update the reference of submodule cocos2d-console.
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
Update README.md, add submodule update command suggestion
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
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