update armature
Merge branch 'yinkaile'
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio
for action
modify cocoAction
delete cocoActionNodeFrame
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio
update armature lib
fix crash
Merge pull request #55 from 2youyouo2/master

update armature lib
Merge pull request #56 from nutty898/master

modify gui lib
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio
modify project configure
Merge pull request #57 from liamcindy/master

modify project configure
fixes #3953
Merge pull request #59 from xiexin36/Bug#3953

fixes #3953
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio