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