issues #2905:Updating project configuration for folder change.
issue #2771: migrate the PhysicsShape definition
issue #2771: migrate the PhysicsBody definition
issue #2905: testcpp bild ok on Android
Merge pull request #3945 from minggo/iss2905-adjust_folder

issue #2905: testcpp bild ok on Android
small fixes for the Xcode projects
Merge pull request #3948 from ricardoquesada/xcode_fixes

small fixes for the Xcode projects
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905
issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix.
Merge pull request #3949 from dumganhar/iss2905-folder-structure

issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now.
issue #2905: [iOS, Mac] Updating project configuration, TestCpp works now.
issue #2905: Reverting TestCpp/Android.mk
issue #2905: [iOS Mac]Removing 'include' folder in 'external' group. Otherwise, it will find wrong included file.
Merge pull request #3951 from dumganhar/iss2905-folder-structure

issue #2905: [iOS Mac] TestJavascript works now.
issue #2905: [iOS Mac] TestJavascript works now.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Merge pull request #3952 from dumganhar/iss2905-folder-structure

issue #2905: [iOS Mac] All js games work now.
issue #2905: [iOS Mac] All js games work now.
Merge pull request #3953 from dumganhar/iss2905-folder-structure

issue #2905: Updating tolua settings.
issue #2905: Updating tolua settings.