Update submodules
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update assets manager test for avoiding modify default resources
Issue #5991: Use progressFromTo instead of progressTo
Update html5 engine
Fixed #5954: Correctly process null parameter for ccs.ArmatureAnimation#setFrameEventCallFunc and ccsArmatureAnimation#setMovementEventCallFunc
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #869 from dingpinglv/develop

Add mp3 format audio file to js-tests
Issue #5991: Use progressFromTo or sequence instead of progressTo
Issue #5993: Fix test case issue o Action Timeline event
Update submodules
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Issue #5983: Modifying the test code
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop-studio

Conflicts:
	samples/js-tests/src/CocosStudio2.0/UIFromCsb.js
Issue #5993: Update cocos ui resources
Issue #5983: Modifying the test code
Merge pull request #870 from pandamicro/develop

Fix issues for 3.1 release and sync -x v3.3 rc0
Issue #5983: Modifying the test code
Merge pull request #871 from VisualSJ/develop-studio

Issue #5983: Modifying the test code