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 js runtime
Merge pull request #891 from dingpinglv/develop

Update the reference of cocos2d-html5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #892 from cocoscodeide/develop

update js runtime
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