Merge pull request #50 from nutty898/master

fixed clipping bugs
Merge pull request #51 from nutty898/master

modify cascadecolor cascadeopacity default value
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.
fixes #3948 add supported for plist.
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