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
Merge pull request #1605 from pandamicro/develop-3.0

Fix some bugs and Update samples
Feature #3427: Refactor get/setCursor to get/setLocation
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
Feature #3940: Make TextDefinition adapt to new property APIs
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0

# By xingsenma
# Via xingsenma (4) and dingpinglv (2)
* 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5:
  issue #4154 update cocostudio gui to 3.0
  issue #3945 Refactor color
Feature #3940: Fix bug of UITextField by removing insertText, deleteBackward properties
issue #3935 Change dirs of engine
issue #3935 Change dirs of engine
issue #3935 Change dirs of engine
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into CCGame_dev3.0
Merge pull request #1608 from SmallAiTT/CCGame_dev3.0

issue #3935 Change dirs of engine
Refactor #4126: Fix bug of wrong getter/setter function name
Fix bugs
Update samples
Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 into develop-3.0

# By SmallJun
# Via SmallJun (2) and dingpinglv (1)
* 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5:
  issue #3935 Change dirs of engine
  issue #3935 Change dirs of engine
  issue #3935 Change dirs of engine