fix timeline test case
Merge pull request #863 from joshuastray/fix_timeline

fix timeline test case
Merge pull request #864 from dingpinglv/develop

Update the reference of cocos2d-html5
Issue #5983: fixed resource path and remove create
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop-studio

Conflicts:
	samples/js-tests/src/ExtensionsTest/CocostudioActionTimelineTest/ActionTimelineTestScene.js
Merge pull request #865 from VisualSJ/develop-studio

Issue #5983: fixed resource path and remove create
Fixed some mistakes for js-tests
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
fix cocostudio test cases
Merge pull request #866 from joshuastray/fix_cocostudio

fix cocostudio test cases
Fixed a bug of CocosNodeTest for new renderer
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop

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