update armature
Merge branch 'yinkaile'
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio
test data of ui editor
Merge pull request #52 from nutty898/master

test data of ui editor
1、fixes #3921  Merge cocos2dx 2.1.4e to  cocos2dx  for cocostudio.
Merge pull request #53 from chengstory/Bug#3921

1、fixes #3921  Merge cocos2dx 2.1.4e to  cocos2dx  for cocostudio.
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
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.
fix crash
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