issue #3945 Refactor color
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0
issue #4154 update cocostudio gui to 3.0
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0
Merge pull request #1606 from xingsenma/develop-3.0

issue #4154 update cocostudio gui to 3.0