issue #4221 add cocostudio gui test
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

Conflicts:
	frameworks/js-bindings/bindings/script/jsb_cocos2d.js
Merge pull request #84 from xingsenma/master

issue #4221 add cocostudio gui test
Issue #4294 : Refactor CCBReader and fix some bugs of cocosbuilder tests.
Merge pull request #86 from SmallAiTT/master

Issue #4294 : Refactor CCBReader and fix some bugs of cocosbuilder tests...
[AUTO] : updating jsbinding automatically
Merge pull request #87 from CocosRobot/update_js_bindings_1394273753

[AUTO] : updating jsbinding automatically
Merge branch 'master' of github.com:cocos2d/cocos2d-js into stl-cocos2dx-3.0

Conflicts:
	frameworks/js-bindings/cocos2d-x