fix timeline test case
Update the reference of cocos2d-html5
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
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop-studio

Conflicts:
	samples/js-tests/src/ExtensionsTest/CocostudioActionTimelineTest/ActionTimelineTestScene.js