Merge branch 'master' of https://github.com/2youyouo2/Cocos2d-x-For-CocoStudio
Merge branch 'master' of https://github.com/2youyouo2/Cocos2d-x-For-CocoStudio

Conflicts:
	samples/Cpp/TestCpp/Classes/ExtensionsTest/SceneEditorTest/SceneEditorTestScene.cpp
Merge pull request #83 from 2youyouo2/master

Update armature
modify for scrollview and textfield
Merge pull request #84 from liamcindy/master

modify for scrollview and textfield
modify textfield
Merge pull request #85 from nutty898/master

modify textfield
pipu develop gui samples
Merge pull request #86 from pipu/pipu_gui_new

pipu develop gui samples
Merge branch 'master' of https://github.com/2youyouo2/Cocos2d-x-For-CocoStudio

Conflicts:
	samples/Cpp/TestCpp/Classes/ExtensionsTest/SceneEditorTest/SceneEditorTestScene.cpp
Merge branch 'master' of https://github.com/chukong/Cocos2d-x-For-CocoStudio
fix change parent bone bug