issue #4154 update cocostudio gui to 3.0
Refactor #4125: Apply bounding getter/setter and new text definition in samples
issue #3935 Change the modules of project.json.
Merge pull request #338 from xingsenma/master_js_3.0

issue #4154 update cocostudio gui to 3.0
Merge pull request #339 from SmallAiTT/tests_js_3.0_ccgame

issue #3935 Change the modules of project.json.
Refactor #4125: Fix bugs in CocoStudio test about getter/setter
Merge branch 'tests_js_3.0' of https://github.com/cocos2d/cocos2d-js-tests into tests_js_3.0

# By SmallJun (1) and xingsenma (1)
# Via dingpinglv (2) and SmallJun (1)
* 'tests_js_3.0' of https://github.com/cocos2d/cocos2d-js-tests:
  issue #3935 Change the modules of project.json.
  issue #4154 update cocostudio gui to 3.0

Conflicts:
	tests/CocoStudioTest/GUITest/UILayoutTest/UILayoutTest.js