Update engine version
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Issue #5993: Arrange test cases
- Remove plugin test for iOS web
- Add Cocos Studio parser test on JSB
[3.1 release] Add docs and update h5 engine
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Issue #5993: Remove armv7s architecture
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update jsb_ext_create_apis.js
Feature #5995  add facebook_is_canvas  param to control whether is Facebook canvas mode or not
Merge pull request #895 from wuzhiming/fb_5th

Feature #5995  add facebook_is_canvas  param to control whether is Faceb...
Feature #5995  change FacebookUserTest canvas.pay
Merge pull request #896 from wuzhiming/fb_5th

Feature #5995  change FacebookUserTest canvas.pay
Update submodules
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #890 from pandamicro/develop

[3.1 release] Add docs and update h5 engine
Update jsb_ext_create_apis.js
Merge pull request #893 from sincntx/develop

new ccui.Button bug fix
Merge pull request #898 from dingpinglv/develop

Merge develop to master branch
Merge pull request #1 from cocos2d/master

Master
fix the bug of cpGroup in segment query and nearest query