Merge pull request #779 from dingpinglv/develop

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

Merge develop to master branch
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