modify macros
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio
modify uiaction files
Merge pull request #12 from nutty898/master

modify ui action files