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 #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
[AUTO] : updating jsbinding automatically
Issue #5993: Fix Timeline's addTouchEventListener issue with the conflict of user object
Issue #5983: Modifying the test code
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Issue #5983: Modifying the test code
[AUTO] : updating jsbinding automatically
Merge pull request #873 from CocosRobot/update_js_bindings_1413814835

[AUTO] : updating jsbinding automatically
Merge pull request #875 from CocosRobot/update_js_bindings_1413815407

[AUTO] : updating jsbinding automatically
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop-rc

Conflicts:
	samples/js-tests/src/CocosStudio2.0/UIFromCsb.js
Merge pull request #874 from VisualSJ/develop-rc

Issue #5983: Modifying the test code
Update the reference of cocos2d-html5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Merge pull request #876 from dingpinglv/develop

Update the reference of cocos2d-html5
Issue #5993: Update cocos ui resources