modify project configure
Merge pull request #40 from liamcindy/master

Modify for new Lib
Merge pull request #41 from nutty898/master

fixed bugs of uiwidget
fixes #3729
1, change JsonReader to CocostudioReader.
2, fixes failed to run AssetsManagerTest.
1， fixes #3729   add Resources to cocos2dx 2.1.4d.
Merge pull request #42 from chengstory/Bug#3729

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

Conflicts:
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosGUITest/CocosGUIScene.cpp
	samples/Cpp/TestCpp/proj.emscripten/Makefile
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj