fix ui color action
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio into cocos2d
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio into cocos2d
add action tag
remove utf8togbk
modify ui action data
merge code from master
Merge pull request #30 from liamcindy/newCoco

New coco