Issue #5983: Add protocolBuffer test
Issue #5933: Remove create and Update timeline test
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop-studio

Conflicts:
	frameworks/cocos2d-html5
	frameworks/js-bindings/bindings/script/jsb_ext_create_apis.js
Merge pull request #848 from VisualSJ/develop-studio

Issue #5983: Add protocolBuffer test