Merge pull request #883 from pandamicro/develop

Issues fix
Update engine version
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update the reference of cocos2d-html5
Issue #5993: Arrange test cases
- Remove plugin test for iOS web
- Add Cocos Studio parser test on JSB
Update the reference of cocos2d-html5
Merge pull request #884 from dingpinglv/develop

Update the reference of cocos2d-html5
simulator Resolution
Merge pull request #886 from VisualSJ/develop-rc

simulator Resolution
fix arguments bug
Merge pull request #888 from joshuastray/develop

fix arguments bug
[3.1 release] Add docs and update h5 engine
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update the reference of cocos2d-html5
Merge pull request #889 from dingpinglv/develop

Update the reference of cocos2d-html5
Issue #5993: Remove armv7s architecture
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop