for action
modify cocoAction
delete cocoActionNodeFrame
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio
modify the way of loading texture
fixes #3948 add supported for plist.
fixed color and opacity bug
Merge pull request #54 from chengstory/feature#3948

fixes #3948 add supported for plist.
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio

Conflicts:
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
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
test version
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
fixed flipping bugs
fixed clipping bug