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
Issue #5983: Modifying the test code
Merge pull request #871 from VisualSJ/develop-studio

Issue #5983: Modifying the test code
Issue #5983: Modifying the test code
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop-rc

Conflicts:
	samples/js-tests/src/CocosStudio2.0/UIFromCsb.js