Issue #4294: Fix LabelAtlas create issue
Merge pull request #146 from pandamicro/master

Issue #4294: Fix LabelAtlas create issue
Fixed #4277: modify menu items in tests-main
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Fixed #4277: update setup.py
Fixed #4277: revert menu item in tests-main.js
Merge pull request #147 from dingpinglv/Iss4277_ReleaseV3.0

Fixed #4277: modify menu items in tests-main and update setup.py
Fixed #4277: update CocoStudio menu
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4277_ReleaseV3.0
Merge pull request #148 from dingpinglv/Iss4277_ReleaseV3.0

Fixed #4277: update CocoStudio menu
update submodule