diff --git a/.gitmodules b/.gitmodules
index 91585f7b9a..79f35bc6d6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@
 [submodule "cocos/scripting/auto-generated"]
 	path = cocos/scripting/auto-generated
 	url = git://github.com/cocos2d-x/bindings-auto-generated.git
-[submodule "samples/Javascript/Shared"]
-	path = samples/Javascript/Shared
+[submodule "samples/test-javascript/tests"]
+	path = samples/test-javascript/tests
 	url = git://github.com/cocos2d/cocos2d-js-tests.git
 [submodule "tools/cocos2d-console"]
 	path = tools/cocos2d-console
diff --git a/AUTHORS b/AUTHORS
index 493859c5be..095386f830 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -95,6 +95,7 @@ Developers:
         Added Mingw-crt Support without breaking VS SDK
         CMake support for windows.
         Added support for x64 target of windows.
+        Added Dutch Language support.
 
     mchinen
         fix emulator issue for OpenGL ES 2.0 on Android
diff --git a/CHANGELOG b/CHANGELOG
index f99dabfa15..f92de1c57e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
-cocos2d-x-3.0rc0 Feb.??? 2014
+cocos2d-x-3.0rc0 Feb.?? 2014
 [All]
+     [NEW]          Adds Dutch Language support.
+
      [FIX]          EGLView improvements: renamed to GLView, no longer a singleton, easier to customize
+     [FIX]          Removes samples except testcpp|testjavascript|testlua. Moves sample games to `cocos2d/samples` repo.
 
 cocos2d-x-3.0beta2 Jan.24 2014
 [All]
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 097c44290c..05d11a0162 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,9 +45,7 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON)
 option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON)
 option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON)
 
-option(BUILD_HelloCpp "Only build HelloCpp sample" ON)
 option(BUILD_TestCpp "Only build TestCpp sample" ON)
-option(BUILD_HelloLua "Only build HelloLua sample" OFF)
 option(BUILD_TestLua "Only build TestLua sample" OFF)
 
 else()#temp
@@ -63,10 +61,7 @@ option(BUILD_EDITOR_SPINE "Build editor support for spine" ON)
 option(BUILD_EDITOR_COCOSTUDIO "Build editor support for cocostudio" ON)
 option(BUILD_EDITOR_COCOSBUILDER "Build editor support for cocosbuilder" ON)
 
-
-option(BUILD_HelloCpp "Only build HelloCpp sample" ON)
 option(BUILD_TestCpp "Only build TestCpp sample" ON)
-option(BUILD_HelloLua "Only build HelloLua sample" ON)
 option(BUILD_TestLua "Only build TestLua sample" ON)
 
 endif()#temp
@@ -285,19 +280,12 @@ add_subdirectory(cocos/scripting)
 endif(BUILD_LIBS_LUA)
 
 # build samples
-if(BUILD_HelloCpp)
-add_subdirectory(samples/Cpp/HelloCpp)
-endif(BUILD_HelloCpp)
 
 if(BUILD_TestCpp)
-add_subdirectory(samples/Cpp/TestCpp)
+add_subdirectory(samples/test-cpp)
 endif(BUILD_TestCpp)
 
-if(BUILD_HelloLua)
-add_subdirectory(samples/Lua/HelloLua)
-endif(BUILD_HelloLua)
-
 if(BUILD_TestLua)
-add_subdirectory(samples/Lua/TestLua)
+add_subdirectory(samples/test-lua)
 endif(BUILD_TestLua)
 
diff --git a/build/android-build.py b/build/android-build.py
index bc00812ace..c66414d47b 100755
--- a/build/android-build.py
+++ b/build/android-build.py
@@ -7,9 +7,9 @@ import os, os.path
 import shutil
 from optparse import OptionParser
 
-CPP_SAMPLES = ['hellocpp', 'testcpp', 'simplegame', 'assetsmanager']
-LUA_SAMPLES = ['hellolua', 'testlua']
-JSB_SAMPLES = ['cocosdragon', 'crystalcraze', 'moonwarriors', 'testjavascript', 'watermelonwithme']
+CPP_SAMPLES = ['testcpp']
+LUA_SAMPLES = ['testlua']
+JSB_SAMPLES = ['testjavascript']
 ALL_SAMPLES = CPP_SAMPLES + LUA_SAMPLES + JSB_SAMPLES
 
 def get_num_of_cpu():
@@ -159,47 +159,23 @@ def copy_resources(target, app_android_root):
 
     # jsb samples should copy javascript files and resources(shared with cocos2d-html5)
     if target in JSB_SAMPLES:
-        resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/javascript/script")
+        resources_dir = os.path.join(app_android_root, "../../../cocos/scripting/javascript/script")
         copy_files(resources_dir, assets_dir)
 
-        if target == "cocosdragon":
-            resources_dir = os.path.join(app_android_root, "../../Shared/games/CocosDragonJS/Published files Android")
-        if target == "crystalcraze":
-            resources_dir = os.path.join(app_android_root, "../../Shared/games/CrystalCraze/Published-Android")
         if target == "testjavascript":
-            resources_dir = os.path.join(app_android_root, "../../Shared/tests/")
-        if target == "watermelonwithme":
-            resources_dir = os.path.join(app_android_root, "../../Shared/games/WatermelonWithMe")
-        if target != "moonwarriors":
-            copy_files(resources_dir, assets_dir)
-        else:
-        	  resources_dir = os.path.join(app_android_root, "../../Shared/games/MoonWarriors/res")
-        	  dst_dir = os.path.join(assets_dir, "res")
-        	  os.mkdir(dst_dir)
-        	  copy_files(resources_dir, dst_dir)
-        	  resources_dir = os.path.join(app_android_root, "../../Shared/games/MoonWarriors/src")
-        	  dst_dir = os.path.join(assets_dir, "src")
-        	  os.mkdir(dst_dir)
-        	  copy_files(resources_dir, dst_dir)
-        	  resources_dir = os.path.join(app_android_root, "../../Shared/games/MoonWarriors")
-        	  for item in os.listdir(resources_dir):
-        	  	  path = os.path.join(resources_dir, item)
-        	  	  if item.endswith('.js') and os.path.isfile(path):
-        	  	  	  shutil.copy(path, assets_dir)
+            resources_dir = os.path.join(app_android_root, "../tests/")
 
-    # AssetsManager test should also copy javascript files
-    if target == "assetsmanager":
-        resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/javascript/script")
         copy_files(resources_dir, assets_dir)
 
+
     # lua samples should copy lua script
     if target in LUA_SAMPLES:
-        resources_dir = os.path.join(app_android_root, "../../../../cocos/scripting/lua/script")
+        resources_dir = os.path.join(app_android_root, "../../../cocos/scripting/lua/script")
         copy_files(resources_dir, assets_dir)
 
         # TestLua shared resources with TestCpp
         if target == "testlua":
-            resources_dir = os.path.join(app_android_root, "../../../Cpp/TestCpp/Resources")
+            resources_dir = os.path.join(app_android_root, "../../test-cpp/Resources")
             copy_files(resources_dir, assets_dir)
 
 def build_samples(target,ndk_build_param,android_platform,build_mode):
@@ -213,12 +189,12 @@ def build_samples(target,ndk_build_param,android_platform,build_mode):
     cocos_root = os.path.join(current_dir, "..")
     
     if android_platform is not None:
-				sdk_root = check_environment_variables_sdk()
-				if android_platform.isdigit():
-						android_platform = 'android-'+android_platform
-				else:
-						print 'please use vaild android platform'
-						exit(1)
+		sdk_root = check_environment_variables_sdk()
+		if android_platform.isdigit():
+			android_platform = 'android-'+android_platform
+		else:
+			print 'please use vaild android platform'
+			exit(1)
     	  
     if build_mode is None:
     	  build_mode = 'debug'
@@ -227,28 +203,12 @@ def build_samples(target,ndk_build_param,android_platform,build_mode):
        
     app_android_root = ''
     for target in build_targets:
-        if target == 'hellocpp':
-            app_android_root = os.path.join(cocos_root, 'samples/Cpp/HelloCpp/proj.android')
-        elif target == 'testcpp':
-            app_android_root = os.path.join(cocos_root, 'samples/Cpp/TestCpp/proj.android')
-        elif target == 'simplegame':
-            app_android_root = os.path.join(cocos_root, 'samples/Cpp/SimpleGame/proj.android')
-        elif target == 'assetsmanager':
-            app_android_root = os.path.join(cocos_root, 'samples/Cpp/AssetsManagerTest/proj.android')
-        elif target == 'hellolua':
-            app_android_root = os.path.join(cocos_root, 'samples/Lua/HelloLua/proj.android')
+        if target == 'testcpp':
+            app_android_root = os.path.join(cocos_root, 'samples/test-cpp/proj.android')
         elif target == 'testlua':
-            app_android_root = os.path.join(cocos_root, 'samples/Lua/TestLua/proj.android')
-        elif target == 'cocosdragon':
-            app_android_root = os.path.join(cocos_root, 'samples/Javascript/CocosDragonJS/proj.android')
-        elif target == 'crystalcraze':
-            app_android_root = os.path.join(cocos_root, 'samples/Javascript/CrystalCraze/proj.android')
-        elif target == 'moonwarriors':
-            app_android_root = os.path.join(cocos_root, 'samples/Javascript/MoonWarriors/proj.android')
+            app_android_root = os.path.join(cocos_root, 'samples/test-lua/proj.android')
         elif target == 'testjavascript':
-            app_android_root = os.path.join(cocos_root, 'samples/Javascript/TestJavascript/proj.android')
-        elif target == 'watermelonwithme':
-            app_android_root = os.path.join(cocos_root, 'samples/Javascript/WatermelonWithMe/proj.android')
+            app_android_root = os.path.join(cocos_root, 'samples/test-javascript/proj.android')
         else:
             print 'unknown target: %s' % target
             continue
@@ -265,24 +225,24 @@ if __name__ == '__main__':
     
     Usage: %prog [options] target
 
-    Valid targets are: [hellocpp|testcpp|simplegame|assetsmanager|hellolua|testlua|cocosdragon|crystalcraze|moonwarriors|testjavascript|watermelonwithme]. You can combine them arbitrarily with a whitespace among two valid targets.
+    Valid targets are: [testcpp|testlua|testjavascript]. You can combine them arbitrarily with a whitespace among two valid targets.
 
     You can use [all|cpp|lua|jsb], to build all the samples, or all the c++ samples, or all the lua samples, or all the jsb samples respectevely.
 
-    cpp  = ['hellocpp', 'testcpp', 'simplegame', 'assetsmanager']
-    lua = ['hellolua', 'testlua']
-    jsb = ['cocosdragon', 'crystalcraze', 'moonwarriors', 'testjavascript', 'watermelonwithme']
+    cpp = ['testcpp']
+    lua = ['testlua']
+    jsb = ['testjavascript']
     all  = cpp + lua + jsb  // be careful with the all target, it may took a very long time to compile all the projects, do it under your own risk.
 
-    If you are new to cocos2d-x, I recommend you start with hellocpp,hellolua or testjavascript.
+    If you are new to cocos2d-x, I recommend you start with testcpp, testlua or testjavascript.
 
     You can combine these targets like this:
 
     //1. to build simplegame and assetsmanager 
-    python android-build.py -p 10 simplegame assetsmanager
+    python android-build.py -p 10 testcpp testlua
 
-    //2. to build hellolua and all the jsb samples
-    python android-build.py -p 19 hellolua jsb
+    //2. to build testlua and all the jsb samples
+    python android-build.py -p 19 testlua jsb
 
     Note: You should install ant to generate apk while building the andriod samples. But it is optional. You can generate apk with eclipse.
     """
diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln
index 3593a117d8..50995fc7e3 100644
--- a/build/cocos2d-win32.vc2012.sln
+++ b/build/cocos2d-win32.vc2012.sln
@@ -5,15 +5,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos\audio\
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp", "..\samples\Cpp\HelloCpp\proj.win32\HelloCpp.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "..\external\Box2D\proj.win32\Box2D.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\samples\Cpp\TestCpp\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCpp", "..\samples\test-cpp\proj.win32\TestCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
 EndProject
@@ -25,29 +23,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\netw
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssetsManagerTest", "..\samples\Cpp\AssetsManagerTest\proj.win32\AssetsManagerTest.vcxproj", "{6D37505F-A890-441D-BD3F-A61E2C0469CE}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBinding", "..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj", "{39379840-825A-45A0-B363-C09FFEF864BD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestJavascript", "..\samples\Javascript\TestJavascript\proj.win32\TestJavascript.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestJavascript", "..\samples\test-javascript\proj.win32\TestJavascript.vcxproj", "{D0F06A44-A245-4D13-A498-0120C203B539}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CocosDragonJS", "..\samples\Javascript\CocosDragonJS\proj.win32\CocosDragonJS.vcxproj", "{68ED0B4E-2BCA-45D2-9648-CEABEBD3B9D7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrystalCraze", "..\samples\Javascript\CrystalCraze\proj.win32\CrystalCraze.vcxproj", "{9A17D9A4-4B11-4E32-94F6-895FF4909EC5}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoonWarriors", "..\samples\Javascript\MoonWarriors\proj.win32\MoonWarriors.vcxproj", "{1DB7C0FC-46FF-4A1B-82E0-C6244EEEC4C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WatermelonWithMe", "..\samples\Javascript\WatermelonWithMe\proj.win32\WatermelonWithMe.vcxproj", "{BE092D9E-95AE-4F86-84CE-F4519E4F3F15}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua\bindings\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "..\samples\Lua\HelloLua\proj.win32\HelloLua.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\samples\Lua\TestLua\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimpleGame", "..\samples\Cpp\SimpleGame\proj.win32\SimpleGame.vcxproj", "{E0E282F4-8487-452C-BFAB-CB960EB4D22F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestLua", "..\samples\test-lua\proj.win32\TestLua.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSBindingForBuilder", "..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj", "{F9DA0FC1-651B-457B-962E-A4D61CEBF5FD}"
 EndProject
diff --git a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
index 3389050ae0..3b9ee9d97c 100644
--- a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-c958533394964fe0c38bd60c272a0b48ec38d9d6
\ No newline at end of file
+fc1947a565933ae570d1ba0e47e9d6b442498da5
\ No newline at end of file
diff --git a/cocos/2d/platform/CCCommon.h b/cocos/2d/platform/CCCommon.h
index fa300cd4fe..fcd28b4997 100644
--- a/cocos/2d/platform/CCCommon.h
+++ b/cocos/2d/platform/CCCommon.h
@@ -56,6 +56,7 @@ enum class LanguageType
     ITALIAN,
     GERMAN,
     SPANISH,
+    DUTCH,
     RUSSIAN,
     KOREAN,
     JAPANESE,
diff --git a/cocos/2d/platform/android/CCApplication.cpp b/cocos/2d/platform/android/CCApplication.cpp
index 3c5b3191b3..e65f47099c 100644
--- a/cocos/2d/platform/android/CCApplication.cpp
+++ b/cocos/2d/platform/android/CCApplication.cpp
@@ -116,6 +116,10 @@ LanguageType Application::getCurrentLanguage()
     {
         ret = LanguageType::RUSSIAN;
     }
+    else if (0 == strcmp("nl", pLanguageName))
+    {
+        ret = LanguageType::DUTCH;
+    }
     else if (0 == strcmp("ko", pLanguageName))
     {
         ret = LanguageType::KOREAN;
diff --git a/cocos/2d/platform/ios/CCApplication.mm b/cocos/2d/platform/ios/CCApplication.mm
index a6bb3b201a..052cfa0665 100644
--- a/cocos/2d/platform/ios/CCApplication.mm
+++ b/cocos/2d/platform/ios/CCApplication.mm
@@ -110,6 +110,9 @@ LanguageType Application::getCurrentLanguage()
     else if ([languageCode isEqualToString:@"es"]){
         ret = LanguageType::SPANISH;
     }
+    else if ([languageCode isEqualToString:@"nl"]){
+        ret = LanguageType::DUTCH;
+    }
     else if ([languageCode isEqualToString:@"ru"]){
         ret = LanguageType::RUSSIAN;
     }
diff --git a/cocos/2d/platform/ios/CCEGLView.mm b/cocos/2d/platform/ios/CCEGLView.mm
index 8bfe57fd12..520f4fe30d 100644
--- a/cocos/2d/platform/ios/CCEGLView.mm
+++ b/cocos/2d/platform/ios/CCEGLView.mm
@@ -70,20 +70,20 @@ EGLView* EGLView::createWithFullScreen(const std::string& viewName)
 
 EGLView::EGLView()
 {
-    CGRect r = CGRectMake(0,0,300,300);
-    CCEAGLView *glView = [CCEAGLView viewWithFrame:r
-                                         pixelFormat: kEAGLColorFormatRGB565
-                                         depthFormat: GL_DEPTH24_STENCIL8_OES
-                                  preserveBackbuffer: NO
-                                          sharegroup: nil
-                                       multiSampling: NO
-                                     numberOfSamples: 0];
-    [__glView setMultipleTouchEnabled:YES];
-
-    _screenSize.width = _designResolutionSize.width = [glview getWidth];
-    _screenSize.height = _designResolutionSize.height = [glview getHeight];
-
-    _glview = glview;
+//    CGRect r = CGRectMake(0,0,300,300);
+//    CCEAGLView *glView = [CCEAGLView viewWithFrame:r
+//                                         pixelFormat: kEAGLColorFormatRGB565
+//                                         depthFormat: GL_DEPTH24_STENCIL8_OES
+//                                  preserveBackbuffer: NO
+//                                          sharegroup: nil
+//                                       multiSampling: NO
+//                                     numberOfSamples: 0];
+//    [__glView setMultipleTouchEnabled:YES];
+//
+//    _screenSize.width = _designResolutionSize.width = [glview getWidth];
+//    _screenSize.height = _designResolutionSize.height = [glview getHeight];
+//
+//    _glview = glview;
 }
 
 EGLView::~EGLView()
diff --git a/cocos/2d/platform/linux/CCApplication.cpp b/cocos/2d/platform/linux/CCApplication.cpp
index ec642f7413..8e476ced36 100644
--- a/cocos/2d/platform/linux/CCApplication.cpp
+++ b/cocos/2d/platform/linux/CCApplication.cpp
@@ -136,58 +136,62 @@ Application* Application::sharedApplication()
 
 LanguageType Application::getCurrentLanguage()
 {
-    char *pLanguageName = getenv("LANG");
-    LanguageType ret = LanguageType::ENGLISH;
-    if (!pLanguageName)
-    {
-        return LanguageType::ENGLISH;
-    }
-    strtok(pLanguageName, "_");
-    if (!pLanguageName)
-    {
-        return LanguageType::ENGLISH;
-    }
-    
-    if (0 == strcmp("zh", pLanguageName))
-    {
-        ret = LanguageType::CHINESE;
-    }
-    else if (0 == strcmp("en", pLanguageName))
-    {
-        ret = LanguageType::ENGLISH;
-    }
-    else if (0 == strcmp("fr", pLanguageName))
-    {
-        ret = LanguageType::FRENCH;
-    }
-    else if (0 == strcmp("it", pLanguageName))
-    {
-        ret = LanguageType::ITALIAN;
-    }
-    else if (0 == strcmp("de", pLanguageName))
-    {
-        ret = LanguageType::GERMAN;
-    }
-    else if (0 == strcmp("es", pLanguageName))
-    {
-        ret = LanguageType::SPANISH;
-    }
-    else if (0 == strcmp("ru", pLanguageName))
-    {
-        ret = LanguageType::RUSSIAN;
-    }
-    else if (0 == strcmp("ko", pLanguageName))
-    {
-        ret = LanguageType::KOREAN;
-    }
-    else if (0 == strcmp("ja", pLanguageName))
-    {
-        ret = LanguageType::JAPANESE;
-    }
-    else if (0 == strcmp("hu", pLanguageName))
-    {
-        ret = LanguageType::HUNGARIAN;
-    }
+	char *pLanguageName = getenv("LANG");
+	LanguageType ret = LanguageType::ENGLISH;
+	if (!pLanguageName)
+	{
+		return LanguageType::ENGLISH;
+	}
+	strtok(pLanguageName, "_");
+	if (!pLanguageName)
+	{
+		return LanguageType::ENGLISH;
+	}
+	
+	if (0 == strcmp("zh", pLanguageName))
+	{
+		ret = LanguageType::CHINESE;
+	}
+	else if (0 == strcmp("en", pLanguageName))
+	{
+		ret = LanguageType::ENGLISH;
+	}
+	else if (0 == strcmp("fr", pLanguageName))
+	{
+		ret = LanguageType::FRENCH;
+	}
+	else if (0 == strcmp("it", pLanguageName))
+	{
+		ret = LanguageType::ITALIAN;
+	}
+	else if (0 == strcmp("de", pLanguageName))
+	{
+		ret = LanguageType::GERMAN;
+	}
+	else if (0 == strcmp("es", pLanguageName))
+	{
+		ret = LanguageType::SPANISH;
+	}
+	else if (0 == strcmp("nl", pLanguageName))
+	{
+		ret = LanguageType::DUTCH;
+	}
+	else if (0 == strcmp("ru", pLanguageName))
+	{
+		ret = LanguageType::RUSSIAN;
+	}
+	else if (0 == strcmp("ko", pLanguageName))
+	{
+		ret = LanguageType::KOREAN;
+	}
+	else if (0 == strcmp("ja", pLanguageName))
+	{
+		ret = LanguageType::JAPANESE;
+	}
+	else if (0 == strcmp("hu", pLanguageName))
+	{
+		ret = LanguageType::HUNGARIAN;
+	}
     else if (0 == strcmp("pt", pLanguageName))
     {
         ret = LanguageType::PORTUGUESE;
diff --git a/cocos/2d/platform/mac/CCApplication.mm b/cocos/2d/platform/mac/CCApplication.mm
index 88285d1fbd..885a4ce7cc 100644
--- a/cocos/2d/platform/mac/CCApplication.mm
+++ b/cocos/2d/platform/mac/CCApplication.mm
@@ -130,6 +130,9 @@ LanguageType Application::getCurrentLanguage()
     else if ([languageCode isEqualToString:@"es"]){
         ret = LanguageType::SPANISH;
     }
+    else if ([languageCode isEqualToString:@"nl"]){
+        ret = LanguageType::DUTCH;
+    }
     else if ([languageCode isEqualToString:@"ru"]){
         ret = LanguageType::RUSSIAN;
     }
diff --git a/cocos/2d/platform/win32/CCApplication.cpp b/cocos/2d/platform/win32/CCApplication.cpp
index 94b923eb97..30447b1e67 100644
--- a/cocos/2d/platform/win32/CCApplication.cpp
+++ b/cocos/2d/platform/win32/CCApplication.cpp
@@ -149,6 +149,9 @@ LanguageType Application::getCurrentLanguage()
         case LANG_SPANISH:
             ret = LanguageType::SPANISH;
             break;
+        case LANG_DUTCH:
+            ret = LanguageType::DUTCH;
+            break;
         case LANG_RUSSIAN:
             ret = LanguageType::RUSSIAN;
             break;
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
deleted file mode 100644
index 198764a991..0000000000
--- a/samples/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-if(BUILD_HelloCpp)
-add_subdirectory(Cpp/HelloCpp)
-endif(BUILD_HelloCpp)
-
-if(BUILD_TestCpp)
-add_subdirectory(Cpp/TestCpp)
-endif(BUILD_TestCpp)
-
-if(BUILD_HelloLua)
-add_subdirectory(Lua/HelloLua)
-endif(BUILD_HelloLua)
-
-if(BUILD_TestLua)
-add_subdirectory(Lua/TestLua)
-endif(BUILD_TestLua)
\ No newline at end of file
diff --git a/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.h b/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.h
deleted file mode 100644
index 2a0dae6d7b..0000000000
--- a/samples/Cpp/AssetsManagerTest/Classes/AppDelegate.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-//  AssetsManagerTestAppDelegate.h
-//  AssetsManagerTest
-//
-//  Created by minggo on 2/5/13.
-//  Copyright __MyCompanyName__ 2013. All rights reserved.
-//
-
-#ifndef  _APP_DELEGATE_H_
-#define  _APP_DELEGATE_H_
-
-#include "CCApplication.h"
-#include "cocos2d.h"
-#include "extensions/assets-manager/AssetsManager.h"
-
-/**
-@brief    The cocos2d Application.
-
-The reason to implement with private inheritance is to hide some interface details of Director.
-*/
-class  AppDelegate : private cocos2d::Application
-{
-public:
-    AppDelegate();
-    virtual ~AppDelegate();
-
-    /**
-    @brief    Implement Director and Scene init code here.
-    @return true    Initialize success, app continue.
-    @return false   Initialize failed, app terminate.
-    */
-    virtual bool applicationDidFinishLaunching();
-
-    /**
-    @brief  The function is called when the application enters the background
-    @param  the pointer of the application instance
-    */
-    virtual void applicationDidEnterBackground();
-
-    /**
-    @brief  The function is called when the application enters the foreground
-    @param  the pointer of the application instance
-    */
-    virtual void applicationWillEnterForeground();
-};
-
-class UpdateLayer : public cocos2d::Layer, public cocos2d::extension::AssetsManagerDelegateProtocol
-{
-public:
-    UpdateLayer();
-    ~UpdateLayer();
-    virtual bool init();
-    
-    void enter(cocos2d::Object *pSender);
-    void reset(cocos2d::Object *pSender);
-    void update(cocos2d::Object *pSender);
-
-    virtual void onError(cocos2d::extension::AssetsManager::ErrorCode errorCode);
-    virtual void onProgress(int percent);
-    virtual void onSuccess();
-    
-private:
-    cocos2d::extension::AssetsManager* pAssetsManager;
-    void createDownloadedDir();
-    
-    cocos2d::MenuItemFont *pItemEnter;
-    cocos2d::MenuItemFont *pItemReset;
-    cocos2d::MenuItemFont *pItemUpdate;
-    cocos2d::LabelTTF *pProgressLabel;
-    std::string pathToSave;
-    bool isUpdateItemClicked;
-};
-
-#endif // _APP_DELEGATE_H_
-
diff --git a/samples/Cpp/AssetsManagerTest/README.md b/samples/Cpp/AssetsManagerTest/README.md
deleted file mode 100644
index 9d39a99748..0000000000
--- a/samples/Cpp/AssetsManagerTest/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-This sample shows how to use AssetsManager to auto-update application resources(pictures or scripts).
-
-In this sample, there is a scene which contains three items:
-* enter
-
-    Start to run script.
-* reset
-
-    Delete downloaded resources and delete recorded version code.
-* update
-
-    Download new version of package if it exits. 
-
-You can use this sample like this:
-* Run original version application(refered as v1)
-
-```
-start application
-click "enter"
-```
-* Run new version application(v2)
-
-```
-start application
-click "update"
-click "enter"
-```
-You will find the changes.
-* Run v1 again after running v2
-
-```
-start application
-click "reset"
-click "enter"
-```
-The application turns back to v1. Ofcourse you can run v2 again as mentioned abave.
-    
diff --git a/samples/Cpp/AssetsManagerTest/Resources/Background.png.REMOVED.git-id b/samples/Cpp/AssetsManagerTest/Resources/Background.png.REMOVED.git-id
deleted file mode 100644
index f02d84fd8f..0000000000
--- a/samples/Cpp/AssetsManagerTest/Resources/Background.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-5fe89fb5bd58cedf13b0363f97b20e3ea7ff255d
\ No newline at end of file
diff --git a/samples/Cpp/AssetsManagerTest/Resources/main.js b/samples/Cpp/AssetsManagerTest/Resources/main.js
deleted file mode 100644
index a796a32e50..0000000000
--- a/samples/Cpp/AssetsManagerTest/Resources/main.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
-
- http://www.cocos2d-x.org
-
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-// boot code needed for cocos2d + JS bindings.
-// Not needed by cocos2d-html5
-
-require('jsb_cocos2d.js');
-
-var appFiles = [
-    'myApp.js'
-];
-
-cc.dumpConfig();
-
-for( var i=0; i < appFiles.length; i++) {
-    require( appFiles[i] );
-}
-
-var director = cc.Director.getInstance();
-director.setDisplayStats(true);
-
-// set FPS. the default value is 1.0/60 if you don't call this
-director.setAnimationInterval(1.0 / 60);
-
-// create a scene. it's an autorelease object
-var myScene = new MyScene();
-
-// run
-director.replaceScene(myScene);
-
diff --git a/samples/Cpp/AssetsManagerTest/Resources/myApp.js b/samples/Cpp/AssetsManagerTest/Resources/myApp.js
deleted file mode 100644
index e2e6342648..0000000000
--- a/samples/Cpp/AssetsManagerTest/Resources/myApp.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2012 cocos2d-x.org
- Copyright (c) 2008-2010 Ricardo Quesada
- Copyright (c) 2011      Zynga Inc.
-
- http://www.cocos2d-x.org
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-var MyLayer = cc.Layer.extend({
-    isMouseDown:false,
-    helloImg:null,
-    helloLabel:null,
-    circle:null,
-    sprite:null,
-
-    ctor:function() {
-        this._super();
-        cc.associateWithNative( this, cc.Layer );
-    },
-
-    init:function () {
-
-        //////////////////////////////
-        // 1. super init first
-        this._super();
-
-        /////////////////////////////
-        // 2. add a menu item with "X" image, which is clicked to quit the program
-        //    you may modify it.
-        // ask director the window size
-        var size = cc.Director.getInstance().getWinSize();
-
-        // add a "close" icon to exit the progress. it's an autorelease object
-        var closeItem = cc.MenuItemImage.create(
-            "CloseNormal.png",
-            "CloseSelected.png",
-            function () {
-                cc.log("close button was clicked.");
-            },this);
-        closeItem.setAnchorPoint(cc.p(0.5, 0.5));
-
-        var menu = cc.Menu.create(closeItem);
-        menu.setPosition(cc.p(0, 0));
-        this.addChild(menu, 1);
-        closeItem.setPosition(cc.p(size.width - 20, 20));
-
-        /////////////////////////////
-        // 3. add your codes below...
-        // add a label shows "Hello World"
-        // create and initialize a label
-        this.helloLabel = cc.LabelTTF.create("Hello World", "Arial", 38);
-        // position the label on the center of the screen
-        this.helloLabel.setPosition(cc.p(size.width / 2, size.height - 40));
-        // add the label as a child to this layer
-        this.addChild(this.helloLabel, 5);
-
-        // add "Helloworld" splash screen"
-        this.sprite = cc.Sprite.create("Background.png");
-        this.sprite.setAnchorPoint(cc.p(0.5, 0.5));
-        this.sprite.setPosition(cc.p(size.width / 2, size.height / 2));
-
-        this.addChild(this.sprite, 0);
-
-        return true;
-    }
-
-});
-
-var MyScene = cc.Scene.extend({
-    ctor:function() {
-        this._super();
-        cc.associateWithNative( this, cc.Scene );
-    },
-
-    onEnter:function () {
-        this._super();
-        var layer = new MyLayer();
-        this.addChild(layer);
-        layer.init();
-    }
-});
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/.project b/samples/Cpp/AssetsManagerTest/proj.android/.project
deleted file mode 100644
index 515077d245..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/.project
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>AssetsManagerTest</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Classes</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/samples/Cpp/AssetsManagerTest/Classes</locationURI>
-		</link>
-		<link>
-			<name>cocos2dx</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/cocos2dx</locationURI>
-		</link>
-		<link>
-			<name>cocosdenshion</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/CocosDenshion</locationURI>
-		</link>
-		<link>
-			<name>extensions</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/extensions</locationURI>
-		</link>
-		<link>
-			<name>scripting</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/scripting</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Cpp/AssetsManagerTest/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/AndroidManifest.xml b/samples/Cpp/AssetsManagerTest/proj.android/AndroidManifest.xml
deleted file mode 100644
index b236420d07..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/AndroidManifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.cocos2dx.AssetsManagerTest"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-feature android:glEsVersion="0x00020000" />
-
-    <application android:label="@string/app_name"
-        android:icon="@drawable/icon">
-
-        <activity android:name=".Cocos2dxActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="landscape"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation">
-
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name="android.app.lib_name"
-                       android:value="game" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <supports-screens android:anyDensity="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:xlargeScreens="true"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest> 
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/build.xml b/samples/Cpp/AssetsManagerTest/proj.android/build.xml
deleted file mode 100644
index 94460967a5..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="AssetsManager" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk b/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk
deleted file mode 100644
index 28588e400a..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/jni/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := game_shared
-
-LOCAL_MODULE_FILENAME := libgame
-
-LOCAL_SRC_FILES := hellocpp/main.cpp \
-                   ../../Classes/AppDelegate.cpp
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes                   
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static
-
-LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,scripting/javascript/bindings)
-$(call import-module,scripting/javascript/bindings/chipmunk)
-$(call import-module,scripting/javascript/bindings/extension)
-$(call import-module,scripting/javascript/bindings/localstorage)
-$(call import-module,scripting/javascript/bindings/network)
-$(call import-module,scripting/javascript/bindings/cocosbuilder)
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk b/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk
deleted file mode 100644
index 74af9626ab..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_STL := gnustl_static
-
-# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
-# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/jni/hellocpp/main.cpp b/samples/Cpp/AssetsManagerTest/proj.android/jni/hellocpp/main.cpp
deleted file mode 100644
index 0d0564246f..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/jni/hellocpp/main.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "AppDelegate.h"
-#include "platform/android/jni/JniHelper.h"
-#include <jni.h>
-#include <android/log.h>
-
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
-
-using namespace cocos2d;
-
-void cocos_android_app_init (struct android_app* app) {
-    LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
-}
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/project.properties b/samples/Cpp/AssetsManagerTest/proj.android/project.properties
deleted file mode 100644
index f7e62936d0..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-10
-android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/res/values/strings.xml b/samples/Cpp/AssetsManagerTest/proj.android/res/values/strings.xml
deleted file mode 100644
index 99a292d37c..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">AssetsManager</string>
-</resources>
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/src/org/cocos2dx/AssetsManagerTest/Cocos2dxActivity.java b/samples/Cpp/AssetsManagerTest/proj.android/src/org/cocos2dx/AssetsManagerTest/Cocos2dxActivity.java
deleted file mode 100644
index c30457e9fb..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.android/src/org/cocos2dx/AssetsManagerTest/Cocos2dxActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.cocos2dx.AssetsManagerTest;
-
-import android.app.NativeActivity;
-import android.graphics.PixelFormat;
-import android.os.Bundle;
-
-public class Cocos2dxActivity extends NativeActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		// TODO Auto-generated method stub
-		super.onCreate(savedInstanceState);
-		
-		//For supports translucency
-		
-		//1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp
-		/*const EGLint attribs[] = {
-	            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-	            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,  
-	            //EGL_BLUE_SIZE, 5,   -->delete 
-	            //EGL_GREEN_SIZE, 6,  -->delete 
-	            //EGL_RED_SIZE, 5,    -->delete 
-	            EGL_BUFFER_SIZE, 32,  //-->new field
-	            EGL_DEPTH_SIZE, 16,
-	            EGL_STENCIL_SIZE, 8,
-	            EGL_NONE
-	    };*/
-		
-		//2.Set the format of window
-		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
-		
-	}
-}
diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/AppController.h b/samples/Cpp/AssetsManagerTest/proj.ios/AppController.h
deleted file mode 100644
index 0979818386..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.ios/AppController.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  AssetsManagerTestAppController.h
-//  AssetsManagerTest
-//
-//  Created by minggo on 2/5/13.
-//  Copyright __MyCompanyName__ 2013. All rights reserved.
-//
-
-@class RootViewController;
-
-@interface AppController : NSObject <UIAccelerometerDelegate, UIAlertViewDelegate, UITextFieldDelegate,UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
-}
-
-@property (nonatomic, retain) UIWindow *window;
-@property (nonatomic, retain) RootViewController *viewController;
-
-@end
-
diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/AppController.mm b/samples/Cpp/AssetsManagerTest/proj.ios/AppController.mm
deleted file mode 100644
index e009328669..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.ios/AppController.mm
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-//  AssetsManagerTestAppController.mm
-//  AssetsManagerTest
-//
-//  Created by minggo on 2/5/13.
-//  Copyright __MyCompanyName__ 2013. All rights reserved.
-//
-#import <UIKit/UIKit.h>
-#import "AppController.h"
-#import "cocos2d.h"
-#import "EAGLView.h"
-#import "AppDelegate.h"
-
-#import "RootViewController.h"
-
-@implementation AppController
-
-@synthesize window;
-@synthesize viewController;
-
-#pragma mark -
-#pragma mark Application lifecycle
-
-// cocos2d application instance
-static AppDelegate s_sharedApplication;
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-
-    // Override point for customization after application launch.
-
-    // Add the view controller's view to the window and display.
-    window = [[UIWindow alloc] initWithFrame: [[UIScreen mainScreen] bounds]];
-    CCEAGLView *__glView = [CCEAGLView viewWithFrame: [window bounds]
-                                     pixelFormat: kEAGLColorFormatRGBA8
-                                     depthFormat: GL_DEPTH_COMPONENT16
-                              preserveBackbuffer: NO
-                                      sharegroup: nil
-                                   multiSampling: NO
-                                 numberOfSamples:0 ];
-
-    // Use RootViewController manage CCEAGLView
-    viewController = [[RootViewController alloc] initWithNibName:nil bundle:nil];
-    viewController.wantsFullScreenLayout = YES;
-    viewController.view = __glView;
-
-    // Set RootViewController to window
-    if ( [[UIDevice currentDevice].systemVersion floatValue] < 6.0)
-    {
-        // warning: addSubView doesn't work on iOS6
-        [window addSubview: viewController.view];
-    }
-    else
-    {
-        // use this method on ios6
-        [window setRootViewController:viewController];
-    }
-    
-    [window makeKeyAndVisible];
-
-    [[UIApplication sharedApplication] setStatusBarHidden: YES];
-
-    cocos2d::Application::getInstance()->run();
-    return YES;
-}
-
-
-- (void)applicationWillResignActive:(UIApplication *)application {
-    /*
-     Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-     Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-     */
-    cocos2d::Director::getInstance()->pause();
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application {
-    /*
-     Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-     */
-    cocos2d::Director::getInstance()->resume();
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application {
-    /*
-     Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-     If your application supports background execution, called instead of applicationWillTerminate: when the user quits.
-     */
-    cocos2d::Application::getInstance()->applicationDidEnterBackground();
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application {
-    /*
-     Called as part of  transition from the background to the inactive state: here you can undo many of the changes made on entering the background.
-     */
-    cocos2d::Application::getInstance()->applicationWillEnterForeground();
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application {
-    /*
-     Called when the application is about to terminate.
-     See also applicationDidEnterBackground:.
-     */
-}
-
-
-#pragma mark -
-#pragma mark Memory management
-
-- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
-    /*
-     Free up as much memory as possible by purging cached data objects that can be recreated (or reloaded from disk) later.
-     */
-     cocos2d::Director::getInstance()->purgeCachedData();
-}
-
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end
-
diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/Prefix.pch b/samples/Cpp/AssetsManagerTest/proj.ios/Prefix.pch
deleted file mode 100644
index 5d8be4921e..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.ios/Prefix.pch
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'AssetsManagerTest' target in the 'AssetsManagerTest' project
-//
-
-#ifdef __OBJC__
-	#import <Foundation/Foundation.h>
-	#import <UIKit/UIKit.h>
-#endif
diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.h b/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.h
deleted file mode 100644
index 17d8b1ca23..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  AssetsManagerTestAppController.h
-//  AssetsManagerTest
-//
-//  Created by minggo on 2/5/13.
-//  Copyright __MyCompanyName__ 2013. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-
-@interface RootViewController : UIViewController {
-
-}
-- (BOOL)prefersStatusBarHidden;
-@end
diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.mm b/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.mm
deleted file mode 100644
index 779facc5b7..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.ios/RootViewController.mm
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-//  AssetsManagerTestAppController.h
-//  AssetsManagerTest
-//
-//  Created by minggo on 2/5/13.
-//  Copyright __MyCompanyName__ 2013. All rights reserved.
-//
-
-#import "RootViewController.h"
-
-
-@implementation RootViewController
-
-/*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-/*
-// Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
-}
-*/
-
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
- 
-*/
-// Override to allow orientations other than the default portrait orientation.
-// This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
-}
-
-// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
-#ifdef __IPHONE_6_0
-    return UIInterfaceOrientationMaskLandscape;
-#endif
-}
-
-- (BOOL) shouldAutorotate {
-    return YES;
-}
-
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end
diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/iTunesArtwork b/samples/Cpp/AssetsManagerTest/proj.ios/iTunesArtwork
deleted file mode 100644
index b1cc056ba5..0000000000
Binary files a/samples/Cpp/AssetsManagerTest/proj.ios/iTunesArtwork and /dev/null differ
diff --git a/samples/Cpp/AssetsManagerTest/proj.ios/main.m b/samples/Cpp/AssetsManagerTest/proj.ios/main.m
deleted file mode 100644
index 2f4612f6a2..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.ios/main.m
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  main.m
-//  AssetsManagerTest
-//
-//  Created by minggo on 2/5/13.
-//  Copyright __MyCompanyName__ 2013. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppController");
-    [pool release];
-    return retVal;
-}
diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj b/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj
deleted file mode 100644
index 7851565229..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6D37505F-A890-441D-BD3F-A61E2C0469CE}</ProjectGuid>
-    <RootNamespace>AssetsManagerTest</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)res.tlb</TypeLibraryName>
-      <HeaderFileName>res.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>res_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>res_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;DEBUG;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;libcurl_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\AssetsManagerTestRes" rd /s /q "$(OutDir)\AssetsManagerTestRes"
-mkdir "$(OutDir)\AssetsManagerTestRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\AssetsManagerTestRes\" /e /Y
-xcopy "$(ProjectDir)..\Resources" "$(OutDir)\AssetsManagerTestRes\" /e /Y</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)res.tlb</TypeLibraryName>
-      <HeaderFileName>res.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>res_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>res_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(EngineRoot)external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;libcurl_imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\AssetsManagerTestRes" rd /s /q "$(OutDir)\AssetsManagerTestRes"
-mkdir "$(OutDir)\AssetsManagerTestRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\AssetsManagerTestRes\" /e /Y
-xcopy "$(ProjectDir)..\Resources" "$(OutDir)\AssetsManagerTestRes\" /e /Y</Command>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="..\Classes\AppDelegate.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="main.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="..\Classes\AppDelegate.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\res.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
-      <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\extension\libJSBindingForExtension.vcxproj">
-      <Project>{625f7391-9a91-48a1-8cfc-79508c822637}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj">
-      <Project>{39379840-825a-45a0-b363-c09ffef864bd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
-      <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
-      <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
-      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.filters b/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.filters
deleted file mode 100644
index de7f9d6f3e..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.filters
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="resource">
-      <UniqueIdentifier>{ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest</Extensions>
-    </Filter>
-    <Filter Include="win32">
-      <UniqueIdentifier>{ccb2323b-1cfa-41ea-bcf4-ba5f07309396}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Classes">
-      <UniqueIdentifier>{e93a77e1-af1e-4400-87d3-504b62ebdbb0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\AppDelegate.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\AppDelegate.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-    <ClInclude Include="main.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\res.ico">
-      <Filter>resource</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.user b/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.user
deleted file mode 100644
index 806c7a2dd6..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.win32/AssetsManagerTest.vcxproj.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\AssetsManagerTestRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\AssetsManagerTestRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/main.cpp b/samples/Cpp/AssetsManagerTest/proj.win32/main.cpp
deleted file mode 100644
index 48e2af43a1..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.win32/main.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "main.h"
-#include "AppDelegate.h"
-#include "CCEGLView.h"
-
-USING_NS_CC;
-
-// uncomment below line, open debug console
-// #define USE_WIN32_CONSOLE
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-
-#ifdef USE_WIN32_CONSOLE
-    AllocConsole();
-    freopen("CONIN$", "r", stdin);
-    freopen("CONOUT$", "w", stdout);
-    freopen("CONOUT$", "w", stderr);
-#endif
-
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("AssetsManagerTest",900,640);
-
-    int ret = Application::getInstance()->run();
-
-#ifdef USE_WIN32_CONSOLE
-    FreeConsole();
-#endif
-
-    return ret;
-}
diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/res.rc b/samples/Cpp/AssetsManagerTest/proj.win32/res.rc
deleted file mode 100644
index 8bb32cb5e8..0000000000
--- a/samples/Cpp/AssetsManagerTest/proj.win32/res.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\res.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "res Module\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "res\0"
-            VALUE "LegalCopyright", "Copyright \0"
-            VALUE "OriginalFilename", "AssetsManagerTest.exe\0"
-            VALUE "ProductName", "AssetsManagerTest Module\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 0x04B0
-    END
-END
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/res/res.ico b/samples/Cpp/AssetsManagerTest/proj.win32/res/res.ico
deleted file mode 100644
index feaf932a74..0000000000
Binary files a/samples/Cpp/AssetsManagerTest/proj.win32/res/res.ico and /dev/null differ
diff --git a/samples/Cpp/HelloCpp/CMakeLists.txt b/samples/Cpp/HelloCpp/CMakeLists.txt
deleted file mode 100644
index 861118b09b..0000000000
--- a/samples/Cpp/HelloCpp/CMakeLists.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-set(APP_NAME hellocpp)
-
-if(QT)
-  set(PLATFORM_SRC
-    proj.qt/main.cpp
-  )
-elseif(ANDROID)
-  set(PLATFORM_SRC
-    proj.android/jni/hellocpp/main.cpp
-  )
-elseif(WIN32)
-  set(PLATFORM_SRC
-    proj.win32/main.cpp
-  )
-elseif(APPLE)
-  if(IOS)
-    set(PLATFORM_SRC
-      proj.ios/main.m
-	  proj.ios/AppController.mm
-	  proj.ios/RootViewController.mm
-    )
-  else()
-    set(PLATFORM_SRC
-      proj.mac/main.m
-    )
-  endif()
-else()
-  set(PLATFORM_SRC
-    proj.linux/main.cpp
-  )
-  endif()
-
-set(SAMPLE_SRC
-  ${PLATFORM_SRC}
-  Classes/AppDelegate.cpp
-  Classes/HelloWorldScene.cpp
-)
-
-# add the executable
-add_executable(${APP_NAME}
-  ${SAMPLE_SRC}
-)
-
-if(WIN32 AND MSVC)
-  #get our resources
-  add_custom_command(TARGET ${APP_NAME} PRE_BUILD
-                     COMMAND ${CMAKE_COMMAND} -E copy_directory
-                         ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${CMAKE_CURRENT_BINARY_DIR})
-  #get our dlls
-  add_custom_command(TARGET ${APP_NAME} PRE_BUILD
-                     COMMAND ${CMAKE_COMMAND} -E copy
-                     ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/win32-specific/gles/prebuilt/glew32.dll 
-					 ${CMAKE_CURRENT_BINARY_DIR})
-
-  add_custom_command(TARGET ${APP_NAME} PRE_BUILD
-                     COMMAND ${CMAKE_COMMAND} -E copy
-                     ${CMAKE_CURRENT_SOURCE_DIR}/../../../external/win32-specific/zlib/prebuilt/zlib1.dll 
-					 ${CMAKE_CURRENT_BINARY_DIR}/Debug)
-
-  #Visual Studio Defaults to wrong type
-  set_target_properties(${APP_NAME} PROPERTIES LINK_FLAGS_DEBUG "/SUBSYSTEM:WINDOWS")
-  set_target_properties(${APP_NAME} PROPERTIES LINK_FLAGS_RELEASE "/SUBSYSTEM:WINDOWS")
-else()
-  set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}")
-
-  set_target_properties(${APP_NAME} PROPERTIES
-       RUNTIME_OUTPUT_DIRECTORY  "${APP_BIN_DIR}")
-
-  pre_build(${APP_NAME}
-    COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources
-    )
-endif()
-
-target_link_libraries(${APP_NAME} audio cocos2d)
diff --git a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp b/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp
deleted file mode 100644
index 077a92aa11..0000000000
--- a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-#include "HelloWorldScene.h"
-#include "AppMacros.h"
-
-#include "CCEventListenerTouch.h"
-
-USING_NS_CC;
-
-
-Scene* HelloWorld::scene()
-{
-    // 'scene' is an autorelease object
-    auto scene = Scene::create();
-    
-    // 'layer' is an autorelease object
-    HelloWorld *layer = HelloWorld::create();
-
-    // add layer as a child to scene
-    scene->addChild(layer);
-
-    // return the scene
-    return scene;
-}
-
-// on "init" you need to initialize your instance
-bool HelloWorld::init()
-{
-    //////////////////////////////
-    // 1. super init first
-    if ( !Layer::init() )
-    {
-        return false;
-    }
-    
-    auto visibleSize = Director::getInstance()->getVisibleSize();
-    auto origin = Director::getInstance()->getVisibleOrigin();
-
-    /////////////////////////////
-    // 2. add a menu item with "X" image, which is clicked to quit the program
-    //    you may modify it.
-
-    // add a "close" icon to exit the progress. it's an autorelease object
-    auto closeItem = MenuItemImage::create(
-                                        "CloseNormal.png",
-                                        "CloseSelected.png",
-                                        CC_CALLBACK_1(HelloWorld::menuCloseCallback,this));
-    
-    closeItem->setPosition(origin + Point(visibleSize) - Point(closeItem->getContentSize() / 2));
-
-    // create menu, it's an autorelease object
-    auto menu = Menu::create(closeItem, NULL);
-    menu->setPosition(Point::ZERO);
-    this->addChild(menu, 1);
-    
-    /////////////////////////////
-    // 3. add your codes below...
-
-    // add a label shows "Hello World"
-    // create and initialize a label
-    
-    auto label = LabelTTF::create("Hello World", "Arial", TITLE_FONT_SIZE);
-    
-    // position the label on the center of the screen
-    label->setPosition(Point(origin.x + visibleSize.width/2,
-                            origin.y + visibleSize.height - label->getContentSize().height));
-
-    // add the label as a child to this layer
-    this->addChild(label, 1);
-
-    // add "HelloWorld" splash screen"
-    auto sprite = Sprite::create("HelloWorld.png");
-
-    // position the sprite on the center of the screen
-    sprite->setPosition(Point(visibleSize / 2) + origin);
-
-    // add the sprite as a child to this layer
-    this->addChild(sprite);
-    
-    return true;
-}
-
-void HelloWorld::menuCloseCallback(Object* sender)
-{
-    Director::getInstance()->end();
-
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
-    exit(0);
-#endif
-}
diff --git a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.h b/samples/Cpp/HelloCpp/Classes/HelloWorldScene.h
deleted file mode 100644
index 876073cdb5..0000000000
--- a/samples/Cpp/HelloCpp/Classes/HelloWorldScene.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __HELLOWORLD_SCENE_H__
-#define __HELLOWORLD_SCENE_H__
-
-#include "cocos2d.h"
-
-class HelloWorld : public cocos2d::Layer
-{
-public:
-    // Here's a difference. Method 'init' in cocos2d-x returns bool, instead of returning 'id' in cocos2d-iphone
-    virtual bool init();  
-
-    // there's no 'id' in cpp, so we recommend returning the class instance pointer
-    static cocos2d::Scene* scene();
-    
-    // a selector callback
-    void menuCloseCallback(Object* sender);
-    
-    // implement the "static node()" method manually
-    CREATE_FUNC(HelloWorld);
-};
-
-#endif // __HELLOWORLD_SCENE_H__
diff --git a/samples/Cpp/HelloCpp/Resources/ipad/HelloWorld.png.REMOVED.git-id b/samples/Cpp/HelloCpp/Resources/ipad/HelloWorld.png.REMOVED.git-id
deleted file mode 100644
index fda9923fa3..0000000000
--- a/samples/Cpp/HelloCpp/Resources/ipad/HelloWorld.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-709d78b7f3eab27056a98d63e9153b35d57b84bc
\ No newline at end of file
diff --git a/samples/Cpp/HelloCpp/Resources/ipadhd/HelloWorld.png.REMOVED.git-id b/samples/Cpp/HelloCpp/Resources/ipadhd/HelloWorld.png.REMOVED.git-id
deleted file mode 100644
index 45e6087f95..0000000000
--- a/samples/Cpp/HelloCpp/Resources/ipadhd/HelloWorld.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-7aa1e9dc799acf384a1c4603054242cc09c1b63e
\ No newline at end of file
diff --git a/samples/Cpp/HelloCpp/Resources/iphone/HelloWorld.png.REMOVED.git-id b/samples/Cpp/HelloCpp/Resources/iphone/HelloWorld.png.REMOVED.git-id
deleted file mode 100644
index d391882e7d..0000000000
--- a/samples/Cpp/HelloCpp/Resources/iphone/HelloWorld.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-9d6facb31897d010352e7b57f4a82715c260408a
\ No newline at end of file
diff --git a/samples/Cpp/HelloCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Cpp/HelloCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Cpp/HelloCpp/proj.android/AndroidManifest.xml b/samples/Cpp/HelloCpp/proj.android/AndroidManifest.xml
deleted file mode 100644
index 79a643c03a..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.cocos2dx.hellocpp"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-feature android:glEsVersion="0x00020000" />
-
-    <application android:label="@string/app_name"
-        android:icon="@drawable/icon">
-
-        <activity android:name=".Cocos2dxActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="landscape"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation">
-
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name="android.app.lib_name"
-                       android:value="hellocpp" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <supports-screens android:anyDensity="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:xlargeScreens="true"/>
-</manifest> 
diff --git a/samples/Cpp/HelloCpp/proj.android/build.xml b/samples/Cpp/HelloCpp/proj.android/build.xml
deleted file mode 100644
index e225e378da..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/build.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="HelloWorld" default="help">
- 
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
- 
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
- 
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
- 
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
- 
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
- 
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
- 
-         -->
-    <property file="ant.properties" />
- 
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
- 
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
- 
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
- 
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
-            unless="sdk.dir"
-    />
- 
- 
-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
- 
-    /* This is typically used for code obfuscation.
-       Compiled code location: ${out.classes.absolute.dir}
-       If this is not done in place, override ${out.dex.input.absolute.dir} */
-    <target name="-post-compile">
-    </target>
--->
- 
-    <!-- Import the actual build file.
- 
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
- 
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
- 
-</project>
diff --git a/samples/Cpp/HelloCpp/proj.android/jni/Android.mk b/samples/Cpp/HelloCpp/proj.android/jni/Android.mk
deleted file mode 100644
index cfd4cb14b5..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/jni/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := hellocpp_shared
-
-LOCAL_MODULE_FILENAME := libhellocpp
-
-LOCAL_SRC_FILES := hellocpp/main.cpp \
-                   ../../Classes/AppDelegate.cpp \
-                   ../../Classes/HelloWorldScene.cpp
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,2d)
-$(call import-module,audio/android)
diff --git a/samples/Cpp/HelloCpp/proj.android/jni/Application.mk b/samples/Cpp/HelloCpp/proj.android/jni/Application.mk
deleted file mode 100644
index 74af9626ab..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_STL := gnustl_static
-
-# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
-# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp b/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp
deleted file mode 100644
index 2b344d9e04..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "AppDelegate.h"
-#include "platform/android/jni/JniHelper.h"
-#include <jni.h>
-#include <android/log.h>
-
-#include "cocos2d.h"
-
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
-
-using namespace cocos2d;
-
-void cocos_android_app_init (struct android_app* app) {
-    LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
-}
diff --git a/samples/Cpp/HelloCpp/proj.android/jni/list.sh b/samples/Cpp/HelloCpp/proj.android/jni/list.sh
deleted file mode 100755
index b29f678cb8..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/jni/list.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-append_str=' \'
-
-list_alldir()
-{
-    for file in $1/*
-    do
-        if [ -f $file ]; then
-            echo $file$append_str | grep .cpp
-        fi
-        
-        if [ -d $file ]; then
-            list_alldir $file            
-        fi
-    done     
-}
-
-if [ $# -gt 0 ]; then
-    list_alldir "$1"
-else
-    list_alldir "."
-fi
diff --git a/samples/Cpp/HelloCpp/proj.android/ndkgdb.sh b/samples/Cpp/HelloCpp/proj.android/ndkgdb.sh
deleted file mode 100755
index de49075f36..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/ndkgdb.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-APPNAME="HelloCpp"
-APP_ANDROID_NAME="org.cocos2dx.hellocpp"
-
-if [ -z "${SDK_ROOT+aaa}" ]; then
-# ... if SDK_ROOT is not set, use "$HOME/bin/android-sdk"
-    SDK_ROOT="$HOME/bin/android-sdk"
-fi
-
-if [ -z "${NDK_ROOT+aaa}" ]; then
-# ... if NDK_ROOT is not set, use "$HOME/bin/android-ndk"
-    NDK_ROOT="$HOME/bin/android-ndk"
-fi
-
-if [ -z "${COCOS2DX_ROOT+aaa}" ]; then
-# ... if COCOS2DX_ROOT is not set
-# ... find current working directory
-    DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# ... use paths relative to current directory
-    COCOS2DX_ROOT="$DIR/../../../.."
-    APP_ROOT="$DIR/.."
-    APP_ANDROID_ROOT="$DIR"
-else
-    APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME"
-    APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android"
-fi
-
-echo "NDK_ROOT = $NDK_ROOT"
-echo "SDK_ROOT = $SDK_ROOT"
-echo "COCOS2DX_ROOT = $COCOS2DX_ROOT"
-echo "APP_ROOT = $APP_ROOT"
-echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT"
-echo "APP_ANDROID_NAME = $APP_ANDROID_NAME"
-
-echo
-echo "Killing and restarting ${APP_ANDROID_NAME}"
-echo
-
-set -x
-
-"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}"
-
-NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \
-    "${NDK_ROOT}"/ndk-gdb \
-    --adb="${SDK_ROOT}"/platform-tools/adb \
-    --verbose \
-    --start \
-    --force
diff --git a/samples/Cpp/HelloCpp/proj.android/res/values/strings.xml b/samples/Cpp/HelloCpp/proj.android/res/values/strings.xml
deleted file mode 100644
index d70da2da7a..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">HelloCpp</string>
-</resources>
diff --git a/samples/Cpp/HelloCpp/proj.android/src/org/cocos2dx/hellocpp/Cocos2dxActivity.java b/samples/Cpp/HelloCpp/proj.android/src/org/cocos2dx/hellocpp/Cocos2dxActivity.java
deleted file mode 100644
index ed4f339cee..0000000000
--- a/samples/Cpp/HelloCpp/proj.android/src/org/cocos2dx/hellocpp/Cocos2dxActivity.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.cocos2dx.hellocpp;
-
-import android.app.NativeActivity;
-import android.os.Bundle;
-
-public class Cocos2dxActivity extends NativeActivity{
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		// TODO Auto-generated method stub
-		super.onCreate(savedInstanceState);
-		
-		//For supports translucency
-		
-		//1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp
-		/*const EGLint attribs[] = {
-	            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-	            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,  
-	            //EGL_BLUE_SIZE, 5,   -->delete 
-	            //EGL_GREEN_SIZE, 6,  -->delete 
-	            //EGL_RED_SIZE, 5,    -->delete 
-	            EGL_BUFFER_SIZE, 32,  //-->new field
-	            EGL_DEPTH_SIZE, 16,
-	            EGL_STENCIL_SIZE, 8,
-	            EGL_NONE
-	    };*/
-		
-		//2.Set the format of window
-		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
-		
-	}
-}
diff --git a/samples/Cpp/HelloCpp/proj.ios/HelloCpp_Prefix.pch b/samples/Cpp/HelloCpp/proj.ios/HelloCpp_Prefix.pch
deleted file mode 100644
index b8914281d2..0000000000
--- a/samples/Cpp/HelloCpp/proj.ios/HelloCpp_Prefix.pch
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'HelloWorld' target in the 'HelloWorld' project
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-    #import <UIKit/UIKit.h>
-#endif
diff --git a/samples/Cpp/HelloCpp/proj.ios/RootViewController.mm b/samples/Cpp/HelloCpp/proj.ios/RootViewController.mm
deleted file mode 100644
index 4984955c8a..0000000000
--- a/samples/Cpp/HelloCpp/proj.ios/RootViewController.mm
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import "RootViewController.h"
-
-
-@implementation RootViewController
-
-/*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-/*
-// Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
-}
-*/
-
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
- 
-*/
-// Override to allow orientations other than the default portrait orientation.
-// This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
-}
-
-// For ios6.0 and higher, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations
-{
-#ifdef __IPHONE_6_0
-    return UIInterfaceOrientationMaskAllButUpsideDown;
-#endif
-}
-
-- (BOOL) shouldAutorotate {
-    return YES;
-}
-
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end
diff --git a/samples/Cpp/HelloCpp/proj.ios/main.m b/samples/Cpp/HelloCpp/proj.ios/main.m
deleted file mode 100644
index bd577a036e..0000000000
--- a/samples/Cpp/HelloCpp/proj.ios/main.m
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  main.m
-//  iphone
-//
-//  Created by Walzer on 10-11-16.
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppController");
-    [pool release];
-    return retVal;
-}
diff --git a/samples/Cpp/HelloCpp/proj.linux/main.cpp b/samples/Cpp/HelloCpp/proj.linux/main.cpp
deleted file mode 100644
index eaac21e713..0000000000
--- a/samples/Cpp/HelloCpp/proj.linux/main.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "../Classes/AppDelegate.h"
-#include "cocos2d.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string>
-
-USING_NS_CC;
-
-int main(int argc, char **argv)
-{
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("HelloCpp",900,640);
-    return Application::getInstance()->run();
-}
diff --git a/samples/Cpp/HelloCpp/proj.mac/HelloCpp_Prefix.pch b/samples/Cpp/HelloCpp/proj.mac/HelloCpp_Prefix.pch
deleted file mode 100644
index 46c36a7e99..0000000000
--- a/samples/Cpp/HelloCpp/proj.mac/HelloCpp_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'Paralaxer' target in the 'Paralaxer' project
-//
-
-#ifdef __OBJC__
-	#import <Cocoa/Cocoa.h>
-#endif
diff --git a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj b/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
deleted file mode 100644
index 6da099a164..0000000000
--- a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}</ProjectGuid>
-    <RootNamespace>HelloCppwin32</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>libcocos2d.lib;libchipmunk.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libcocos2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Classes\AppDelegate.cpp" />
-    <ClCompile Include="..\Classes\HelloWorldScene.cpp" />
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Classes\AppDelegate.h" />
-    <ClInclude Include="..\Classes\AppMacros.h" />
-    <ClInclude Include="..\Classes\HelloWorldScene.h" />
-    <ClInclude Include="main.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
-      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.filters b/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.filters
deleted file mode 100644
index eb52c5e24c..0000000000
--- a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.filters
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Classes">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="win32">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Classes\AppDelegate.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\HelloWorldScene.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Classes\AppDelegate.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\HelloWorldScene.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-    <ClInclude Include="main.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\AppMacros.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.user b/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.user
deleted file mode 100644
index 32a6296820..0000000000
--- a/samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Cpp/HelloCpp/proj.win32/main.cpp b/samples/Cpp/HelloCpp/proj.win32/main.cpp
deleted file mode 100644
index bcc0e091d4..0000000000
--- a/samples/Cpp/HelloCpp/proj.win32/main.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "main.h"
-#include "../Classes/AppDelegate.h"
-#include "CCEGLView.h"
-
-USING_NS_CC;
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("HelloCpp",900,640);
-    return Application::getInstance()->run();
-}
diff --git a/samples/Cpp/SimpleGame/Classes/AppDelegate.h b/samples/Cpp/SimpleGame/Classes/AppDelegate.h
deleted file mode 100644
index 18ee8aeb63..0000000000
--- a/samples/Cpp/SimpleGame/Classes/AppDelegate.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef  _APP_DELEGATE_H_
-#define  _APP_DELEGATE_H_
-
-#include "cocos2d.h"
-
-/**
-@brief    The cocos2d Application.
-
-The reason for implement as private inheritance is to hide some interface call by Director.
-*/
-class  AppDelegate : private cocos2d::Application
-{
-public:
-    AppDelegate();
-    virtual ~AppDelegate();
-
-    /**
-    @brief    Implement Director and Scene init code here.
-    @return true    Initialize success, app continue.
-    @return false   Initialize failed, app terminate.
-    */
-    virtual bool applicationDidFinishLaunching();
-
-    /**
-    @brief  The function be called when the application enter background
-    @param  the pointer of the application
-    */
-    virtual void applicationDidEnterBackground();
-
-    /**
-    @brief  The function be called when the application enter foreground
-    @param  the pointer of the application
-    */
-    virtual void applicationWillEnterForeground();
-};
-
-#endif // _APP_DELEGATE_H_
-
diff --git a/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp b/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp
deleted file mode 100644
index a7b72e8b3c..0000000000
--- a/samples/Cpp/SimpleGame/Classes/GameOverScene.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ray Wenderlich
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#include "GameOverScene.h"
-#include "HelloWorldScene.h"
-
-using namespace cocos2d;
-
-bool GameOverScene::init()
-{
-	if( Scene::init() )
-	{
-		this->_layer = GameOverLayer::create();
-		this->_layer->retain();
-		this->addChild(_layer);
-		
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
-GameOverScene::~GameOverScene()
-{
-	if (_layer)
-	{
-		_layer->release();
-		_layer = NULL;
-	}
-}
-
-
-bool GameOverLayer::init()
-{
-	if ( LayerColor::initWithColor( Color4B(255,255,255,255) ) )
-	{
-		auto winSize = Director::getInstance()->getWinSize();
-		this->_label = LabelTTF::create("","Artial", 32);
-		_label->retain();
-		_label->setColor( Color3B(0, 0, 0) );
-		_label->setPosition( Point(winSize.width/2, winSize.height/2) );
-		this->addChild(_label);
-		
-		this->runAction( Sequence::create(
-                                DelayTime::create(3),
-                                CallFunc::create( CC_CALLBACK_0(GameOverLayer::gameOverDone, this)),
-                                NULL));
-		
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-}
-
-void GameOverLayer::gameOverDone()
-{
-	Director::getInstance()->replaceScene( HelloWorld::scene() );
-}
-
-GameOverLayer::~GameOverLayer()
-{
-	if (_label)
-	{
-		_label->release();
-		_label = NULL;
-	}
-}
diff --git a/samples/Cpp/SimpleGame/Classes/GameOverScene.h b/samples/Cpp/SimpleGame/Classes/GameOverScene.h
deleted file mode 100644
index 1bbf1907e1..0000000000
--- a/samples/Cpp/SimpleGame/Classes/GameOverScene.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ray Wenderlich
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#ifndef _GAME_OVER_SCENE_H_
-#define _GAME_OVER_SCENE_H_
-
-#include "cocos2d.h"
-
-class GameOverLayer : public cocos2d::LayerColor
-{
-public:
-    GameOverLayer():_label(NULL) {};
-    virtual ~GameOverLayer();
-    bool init();
-    CREATE_FUNC(GameOverLayer);
-
-    void gameOverDone();
-
-    CC_SYNTHESIZE_READONLY(cocos2d::LabelTTF*, _label, Label);
-};
-
-class GameOverScene : public cocos2d::Scene
-{
-public:
-    GameOverScene():_layer(NULL) {};
-    ~GameOverScene();
-    bool init();
-    CREATE_FUNC(GameOverScene);
-  
-    CC_SYNTHESIZE_READONLY(GameOverLayer*, _layer, Layer);
-};
-
-#endif // _GAME_OVER_SCENE_H_
diff --git a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp
deleted file mode 100644
index 85d2f97be9..0000000000
--- a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-#include "HelloWorldScene.h"
-#include "GameOverScene.h"
-#include "SimpleAudioEngine.h"
-
-using namespace cocos2d;
-
-HelloWorld::~HelloWorld()
-{
-	if (_targets)
-	{
-		_targets->release();
-		_targets = NULL;
-	}
-
-	if (_projectiles)
-	{
-		_projectiles->release();
-		_projectiles = NULL;
-	}
-
-	// cpp don't need to call super dealloc
-	// virtual destructor will do this
-}
-
-HelloWorld::HelloWorld()
-:_targets(NULL)
-,_projectiles(NULL)
-,_projectilesDestroyed(0)
-{
-}
-
-Scene* HelloWorld::scene()
-{
-	Scene * scene = NULL;
-	do 
-	{
-		// 'scene' is an autorelease object
-		scene = Scene::create();
-		CC_BREAK_IF(! scene);
-
-		// 'layer' is an autorelease object
-		HelloWorld *layer = HelloWorld::create();
-		CC_BREAK_IF(! layer);
-
-		// add layer as a child to scene
-		scene->addChild(layer);
-	} while (0);
-
-	// return the scene
-	return scene;
-}
-
-// on "init" you need to initialize your instance
-bool HelloWorld::init()
-{
-	bool bRet = false;
-	do 
-	{
-		//////////////////////////////////////////////////////////////////////////
-		// super init first
-		//////////////////////////////////////////////////////////////////////////
-
-		CC_BREAK_IF(! LayerColor::initWithColor( Color4B(255,255,255,255) ) );
-
-		//////////////////////////////////////////////////////////////////////////
-		// add your codes below...
-		//////////////////////////////////////////////////////////////////////////
-
-		// 1. Add a menu item with "X" image, which is clicked to quit the program.
-
-		// Create a "close" menu item with close icon, it's an auto release object.
-		auto closeItem = MenuItemImage::create(
-			"CloseNormal.png",
-			"CloseSelected.png",
-            CC_CALLBACK_1(HelloWorld::menuCloseCallback,this));
-		CC_BREAK_IF(! closeItem);
-        
-		// Place the menu item bottom-right conner.
-        auto visibleSize = Director::getInstance()->getVisibleSize();
-        auto origin = Director::getInstance()->getVisibleOrigin();
-        
-		closeItem->setPosition(Point(origin.x + visibleSize.width - closeItem->getContentSize().width/2,
-                                    origin.y + closeItem->getContentSize().height/2));
-
-		// Create a menu with the "close" menu item, it's an auto release object.
-		auto menu = Menu::create(closeItem, NULL);
-		menu->setPosition(Point::ZERO);
-		CC_BREAK_IF(! menu);
-
-		// Add the menu to HelloWorld layer as a child layer.
-		this->addChild(menu, 1);
-
-		/////////////////////////////
-		// 2. add your codes below...
-		auto player = Sprite::create("Player.png", Rect(0, 0, 27, 40) );
-        
-		player->setPosition( Point(origin.x + player->getContentSize().width/2,
-                                 origin.y + visibleSize.height/2) );
-		this->addChild(player);
-
-		this->schedule( schedule_selector(HelloWorld::gameLogic), 1.0 );
-
-        auto dispatcher = Director::getInstance()->getEventDispatcher();
-        auto listener = EventListenerTouchAllAtOnce::create();
-        listener->onTouchesEnded = CC_CALLBACK_2(HelloWorld::onTouchesEnded, this);
-        dispatcher->addEventListenerWithSceneGraphPriority(listener, this);
-        
-		_targets = new Array();
-        _targets->init();
-        
-		_projectiles = new Array();
-        _projectiles->init();
-
-		// use updateGame instead of update, otherwise it will conflit with SelectorProtocol::update
-		// see http://www.cocos2d-x.org/boards/6/topics/1478
-		this->schedule( schedule_selector(HelloWorld::updateGame) );
-
-		CocosDenshion::SimpleAudioEngine::getInstance()->playBackgroundMusic("background-music-aac.wav", true);
-
-		bRet = true;
-	} while (0);
-
-	return bRet;
-}
-
-void HelloWorld::menuCloseCallback(Object* sender)
-{
-	// "close" menu item clicked
-	Director::getInstance()->end();
-}
-
-// cpp with cocos2d-x
-void HelloWorld::addTarget()
-{
-	Sprite *target = Sprite::create("Target.png", Rect(0,0,27,40) );
-    
-	// Determine where to spawn the target along the Y axis
-	Size winSize = Director::getInstance()->getVisibleSize();
-	float minY = target->getContentSize().height/2;
-	float maxY = winSize.height -  target->getContentSize().height/2;
-	int rangeY = (int)(maxY - minY);
-	// srand( TimGetTicks() );
-	int actualY = ( rand() % rangeY ) + (int)minY;
-
-	// Create the target slightly off-screen along the right edge,
-	// and along a random position along the Y axis as calculated
-	target->setPosition( 
-		Point(winSize.width + (target->getContentSize().width/2), 
-            Director::getInstance()->getVisibleOrigin().y + actualY) );
-	this->addChild(target);
-
-	// Determine speed of the target
-	int minDuration = (int)2.0;
-	int maxDuration = (int)4.0;
-	int rangeDuration = maxDuration - minDuration;
-	// srand( TimGetTicks() );
-	int actualDuration = ( rand() % rangeDuration ) + minDuration;
-
-	// Create the actions
-	FiniteTimeAction* actionMove = MoveTo::create( (float)actualDuration,
-                                            Point(0 - target->getContentSize().width/2, actualY) );
-	FiniteTimeAction* actionMoveDone = CallFuncN::create( CC_CALLBACK_1(HelloWorld::spriteMoveFinished, this));
-	target->runAction( Sequence::create(actionMove, actionMoveDone, NULL) );
-
-	// Add to targets array
-	target->setTag(1);
-	_targets->addObject(target);
-}
-
-void HelloWorld::spriteMoveFinished(Node* sender)
-{
-	Sprite *sprite = (Sprite *)sender;
-	this->removeChild(sprite, true);
-
-	if (sprite->getTag() == 1)  // target
-	{
-		_targets->removeObject(sprite);
-        
-		auto gameOverScene = GameOverScene::create();
-		gameOverScene->getLayer()->getLabel()->setString("You Lose :[");
-		Director::getInstance()->replaceScene(gameOverScene);
-
-	}
-	else if (sprite->getTag() == 2) // projectile
-	{
-		_projectiles->removeObject(sprite);
-	}
-}
-
-void HelloWorld::gameLogic(float dt)
-{
-	this->addTarget();
-}
-
-// cpp with cocos2d-x
-void HelloWorld::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
-{
-	// Choose one of the touches to work with
-	Touch* touch = touches[0];
-	Point location = touch->getLocation();
-    
-	log("++++++++after  x:%f, y:%f", location.x, location.y);
-
-	// Set up initial location of projectile
-	Size winSize = Director::getInstance()->getVisibleSize();
-    auto origin = Director::getInstance()->getVisibleOrigin();
-	Sprite *projectile = Sprite::create("Projectile.png", Rect(0, 0, 20, 20));
-	projectile->setPosition( Point(origin.x+20, origin.y+winSize.height/2) );
-
-	// Determinie offset of location to projectile
-	float offX = location.x - projectile->getPosition().x;
-	float offY = location.y - projectile->getPosition().y;
-
-	// Bail out if we are shooting down or backwards
-	if (offX <= 0) return;
-
-	// Ok to add now - we've double checked position
-	this->addChild(projectile);
-
-	// Determine where we wish to shoot the projectile to
-	float realX = origin.x+winSize.width + (projectile->getContentSize().width/2);
-	float ratio = offY / offX;
-	float realY = (realX * ratio) + projectile->getPosition().y;
-	Point realDest = Point(realX, realY);
-
-	// Determine the length of how far we're shooting
-	float offRealX = realX - projectile->getPosition().x;
-	float offRealY = realY - projectile->getPosition().y;
-	float length = sqrtf((offRealX * offRealX) + (offRealY*offRealY));
-	float velocity = 480/1; // 480pixels/1sec
-	float realMoveDuration = length/velocity;
-
-	// Move projectile to actual endpoint
-	projectile->runAction( Sequence::create(
-		MoveTo::create(realMoveDuration, realDest),
-		CallFuncN::create(CC_CALLBACK_1(HelloWorld::spriteMoveFinished, this)),
-                                            NULL) );
-
-	// Add to projectiles array
-	projectile->setTag(2);
-	_projectiles->addObject(projectile);
-
-	CocosDenshion::SimpleAudioEngine::getInstance()->playEffect("pew-pew-lei.wav");
-}
-
-void HelloWorld::updateGame(float dt)
-{
-	Array *projectilesToDelete = new Array();
-    projectilesToDelete->init();
-    
-    Object* it = NULL;
-    Object* jt = NULL;
-
-	// for (it = _projectiles->begin(); it != _projectiles->end(); it++)
-    CCARRAY_FOREACH(_projectiles, it)
-	{
-		auto projectile = dynamic_cast<Sprite*>(it);
-		auto projectileRect = Rect(
-			projectile->getPosition().x - (projectile->getContentSize().width/2),
-			projectile->getPosition().y - (projectile->getContentSize().height/2),
-			projectile->getContentSize().width,
-			projectile->getContentSize().height);
-
-		auto targetsToDelete = new Array();
-        targetsToDelete->init();
-
-		// for (jt = _targets->begin(); jt != _targets->end(); jt++)
-        CCARRAY_FOREACH(_targets, jt)
-		{
-			auto target = dynamic_cast<Sprite*>(jt);
-			auto targetRect = Rect(
-				target->getPosition().x - (target->getContentSize().width/2),
-				target->getPosition().y - (target->getContentSize().height/2),
-				target->getContentSize().width,
-				target->getContentSize().height);
-
-			// if (Rect::RectIntersectsRect(projectileRect, targetRect))
-            if (projectileRect.intersectsRect(targetRect))
-			{
-				targetsToDelete->addObject(target);
-			}
-		}
-
-		// for (jt = targetsToDelete->begin(); jt != targetsToDelete->end(); jt++)
-        CCARRAY_FOREACH(targetsToDelete, jt)
-		{
-			auto target = dynamic_cast<Sprite*>(jt);
-			_targets->removeObject(target);
-			this->removeChild(target, true);
-
-			_projectilesDestroyed++;
-			if (_projectilesDestroyed >= 5)
-			{
-				auto gameOverScene = GameOverScene::create();
-				gameOverScene->getLayer()->getLabel()->setString("You Win!");
-				Director::getInstance()->replaceScene(gameOverScene);
-			}
-		}
-
-		if (targetsToDelete->count() > 0)
-		{
-			projectilesToDelete->addObject(projectile);
-		}
-		targetsToDelete->release();
-	}
-
-	// for (it = projectilesToDelete->begin(); it != projectilesToDelete->end(); it++)
-    CCARRAY_FOREACH(projectilesToDelete, it)
-	{
-		auto projectile = dynamic_cast<Sprite*>(it);
-		_projectiles->removeObject(projectile);
-		this->removeChild(projectile, true);
-	}
-	projectilesToDelete->release();
-}
-
diff --git a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h b/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h
deleted file mode 100644
index ee65eb2f08..0000000000
--- a/samples/Cpp/SimpleGame/Classes/HelloWorldScene.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef __HELLOWORLD_SCENE_H__
-#define __HELLOWORLD_SCENE_H__
-
-#include "cocos2d.h"
-
-//#include "SimpleAudioEngine.h"
-
-class HelloWorld : public cocos2d::LayerColor
-{
-public:
-	HelloWorld();
-	~HelloWorld();
-
-	// Here's a difference. Method 'init' in cocos2d-x returns bool, 
-    // instead of returning 'id' in cocos2d-iphone
-	virtual bool init();  
-
-	// there's no 'id' in cpp, so we recommand to return the exactly class pointer
-	static cocos2d::Scene* scene();
-
-	// a selector callback
-	virtual void menuCloseCallback(cocos2d::Object* sender);
-
-	// implement the "static node()" method manually
-	CREATE_FUNC(HelloWorld);
-
-	void spriteMoveFinished(cocos2d::Node* sender);
-
-	void gameLogic(float dt);
-
-	void updateGame(float dt);
-
-	void onTouchesEnded(const std::vector<cocos2d::Touch*>& touches, cocos2d::Event* event);
-    
-    
-protected:
-	cocos2d::Array *_targets;
-	cocos2d::Array *_projectiles;
-	int _projectilesDestroyed;
-
-	void addTarget();
-
-
-};
-
-#endif  // __HELLOWORLD_SCENE_H__
diff --git a/samples/Cpp/SimpleGame/Resources/.gitignore b/samples/Cpp/SimpleGame/Resources/.gitignore
deleted file mode 100644
index 1d65afe366..0000000000
--- a/samples/Cpp/SimpleGame/Resources/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#Do now ignore  Marmalade icf files
-!*.icf
diff --git a/samples/Cpp/SimpleGame/Resources/app.config.txt b/samples/Cpp/SimpleGame/Resources/app.config.txt
deleted file mode 100644
index b39bf0b1db..0000000000
--- a/samples/Cpp/SimpleGame/Resources/app.config.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# This .config.txt file documents configuration settings for your
-# application
-# The syntax is similar to that in .icf files:
-#
-# [GroupName]
-# Setting     Documentation for setting
-#
-# e.g.
-# [MyApplicationGroup]
-# MySetting   Description of what MySetting is for, its default values, etc
diff --git a/samples/Cpp/SimpleGame/proj.android/.classpath b/samples/Cpp/SimpleGame/proj.android/.classpath
deleted file mode 100644
index c06dfcb8e5..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/samples/Cpp/SimpleGame/proj.android/.project b/samples/Cpp/SimpleGame/proj.android/.project
deleted file mode 100644
index bf3f3d0350..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/.project
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>SimpleGame</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Classes</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/samples/Cpp/SimpleGame/Classes</locationURI>
-		</link>
-		<link>
-			<name>cocos2dx</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/cocos2dx</locationURI>
-		</link>
-		<link>
-			<name>cocosdenshion</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/CocosDenshion</locationURI>
-		</link>
-		<link>
-			<name>extensions</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/extensions</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/samples/Cpp/SimpleGame/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Cpp/SimpleGame/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Cpp/SimpleGame/proj.android/AndroidManifest.xml b/samples/Cpp/SimpleGame/proj.android/AndroidManifest.xml
deleted file mode 100644
index a0a36be837..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/AndroidManifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.cocos2dx.simplegame"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-feature android:glEsVersion="0x00020000" />
-
-    <application android:label="@string/app_name"
-                 android:icon="@drawable/icon">
-
-
-        <activity android:name=".Cocos2dxActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="landscape"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation">
-
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name="android.app.lib_name"
-                       android:value="game" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <supports-screens android:anyDensity="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:xlargeScreens="true"/>
-</manifest> 
diff --git a/samples/Cpp/SimpleGame/proj.android/README.md b/samples/Cpp/SimpleGame/proj.android/README.md
deleted file mode 100644
index 312835611a..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-## Prerequisites:
-
-* Android NDK
-* Android SDK **OR** Eclipse ADT Bundle
-* Android AVD target installed
-
-## Building project
-
-There are two ways of building Android projects.
-
-1. Eclipse
-2. Command Line
-
-### Import Project in Eclipse
-
-#### Features:
-
-1. Complete workflow from Eclipse, including:
-	* Build C++.
-	* Clean C++.
-	* Build and Run whole project.
-	* Logcat view.
-	* Debug Java code.
-	* Javascript editor.
-	* Project management.
-2. True C++ editing, including:
-	* Code completion. 
-	* Jump to definition.
-	* Refactoring tools etc. 
-	* Quick open C++ files.
-
-
-#### Setup Eclipse Environment (only once)
-
-
-**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before.
-
-1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html)
-
-   **OR**
-
-   Install Eclipse with Java. Add ADT and CDT plugins.
-
-2. Only for Windows
-    1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install).
-    2. Add `Cygwin\bin` directory to system PATH variable.
-    3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file.
-   
-3. Set up Variables: 
-	1. Path Variable `COCOS2DX`: 
-		* Eclipse->Preferences->General->Workspace->**Linked Resources**
-		* Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory.
-		![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png)
-
-	2. C/C++ Environment Variable `NDK_ROOT`: 
-		* Eclipse->Preferences->C/C++->Build->**Environment**.
-		* Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory.
-		![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png)
-		* Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr`
-		
-4. Import libcocos2dx library project:
-	1. File->New->Project->Android Project From Existing Code.
-	2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory.
-	3. Click **Finish** to add project.
-	
-#### Adding and running from Eclipse
-
-![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png)
-
-1. File->New->Project->Android Project From Existing Code
-2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/`
-3. Add the project 
-4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator.
-
-
-### Running project from Command Line
-
-    $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/
-    $ export NDK_ROOT=/path/to/ndk
-    $ ./build_native.sh
-    $ ant debug install
-
-If the last command results in sdk.dir missing error then do: 
-
-    $ android list target
-    $ android update project -p . -t (id from step 6)
-    $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6)
diff --git a/samples/Cpp/SimpleGame/proj.android/build.xml b/samples/Cpp/SimpleGame/proj.android/build.xml
deleted file mode 100644
index e9678a9b14..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="SimpleGame" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/samples/Cpp/SimpleGame/proj.android/jni/Android.mk b/samples/Cpp/SimpleGame/proj.android/jni/Android.mk
deleted file mode 100644
index cdc6ac3234..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/jni/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := game_shared
-
-LOCAL_MODULE_FILENAME := libgame
-
-LOCAL_SRC_FILES := hellocpp/main.cpp \
-                   ../../Classes/AppDelegate.cpp \
-                   ../../Classes/HelloWorldScene.cpp \
-                   ../../Classes/GameOverScene.cpp
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes                   
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,audio/android)
-$(call import-module,2d)
diff --git a/samples/Cpp/SimpleGame/proj.android/jni/Application.mk b/samples/Cpp/SimpleGame/proj.android/jni/Application.mk
deleted file mode 100644
index 74af9626ab..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_STL := gnustl_static
-
-# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
-# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Cpp/SimpleGame/proj.android/jni/hellocpp/main.cpp b/samples/Cpp/SimpleGame/proj.android/jni/hellocpp/main.cpp
deleted file mode 100644
index ab92fe0f5a..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/jni/hellocpp/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "AppDelegate.h"
-#include "platform/android/jni/JniHelper.h"
-#include <jni.h>
-#include <android/log.h>
-
-#include "HelloWorldScene.h"
-
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
-
-using namespace cocos2d;
-
-void cocos_android_app_init (struct android_app* app) {
-    LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
-}
diff --git a/samples/Cpp/SimpleGame/proj.android/jni/list.sh b/samples/Cpp/SimpleGame/proj.android/jni/list.sh
deleted file mode 100755
index b29f678cb8..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/jni/list.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-append_str=' \'
-
-list_alldir()
-{
-    for file in $1/*
-    do
-        if [ -f $file ]; then
-            echo $file$append_str | grep .cpp
-        fi
-        
-        if [ -d $file ]; then
-            list_alldir $file            
-        fi
-    done     
-}
-
-if [ $# -gt 0 ]; then
-    list_alldir "$1"
-else
-    list_alldir "."
-fi
diff --git a/samples/Cpp/SimpleGame/proj.android/ndkgdb.sh b/samples/Cpp/SimpleGame/proj.android/ndkgdb.sh
deleted file mode 100755
index ed934f9bfb..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/ndkgdb.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-APPNAME="SimpleGame"
-APP_ANDROID_NAME="org.cocos2dx.simplegame"
-
-# read local.properties
-
-_LOCALPROPERTIES_FILE=$(dirname "$0")"/local.properties"
-if [ -f "$_LOCALPROPERTIES_FILE" ]
-then
-    [ -r "$_LOCALPROPERTIES_FILE" ] || die "Fatal Error: $_LOCALPROPERTIES_FILE exists but is unreadable"
-
-    # strip out entries with a "." because Bash cannot process variables with a "."
-    _PROPERTIES=$(sed '/\./d' "$_LOCALPROPERTIES_FILE")
-    for line in $_PROPERTIES
-    do
-        declare "$line"
-    done
-fi
-
-if [ -z "${SDK_ROOT+aaa}" ]; then
-echo "SDK_ROOT not defined. Please define SDK_ROOT in your environment or in local.properties"
-exit 1
-fi
-
-if [ -z "${NDK_ROOT+aaa}" ]; then
-echo "NDK_ROOT not defined. Please define NDK_ROOT in your environment or in local.properties"
-exit 1
-fi
-
-if [ -z "${COCOS2DX_ROOT+aaa}" ]; then
-# ... if COCOS2DX_ROOT is not set
-# ... find current working directory
-    DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# ... use paths relative to current directory
-    COCOS2DX_ROOT="$DIR/../../../.."
-    APP_ROOT="$DIR/.."
-    APP_ANDROID_ROOT="$DIR"
-else
-    APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME"
-    APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android"
-fi
-
-echo "NDK_ROOT = $NDK_ROOT"
-echo "SDK_ROOT = $SDK_ROOT"
-echo "COCOS2DX_ROOT = $COCOS2DX_ROOT"
-echo "APP_ROOT = $APP_ROOT"
-echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT"
-echo "APP_ANDROID_NAME = $APP_ANDROID_NAME"
-
-echo
-echo "Killing and restarting ${APP_ANDROID_NAME}"
-echo
-
-set -x
-
-"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}"
-
-NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \
-    "${NDK_ROOT}"/ndk-gdb \
-    --adb="${SDK_ROOT}"/platform-tools/adb \
-    --verbose \
-    --start \
-    --force
diff --git a/samples/Cpp/SimpleGame/proj.android/project.properties b/samples/Cpp/SimpleGame/proj.android/project.properties
deleted file mode 100644
index f7e62936d0..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-10
-android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Cpp/SimpleGame/proj.android/res/values/strings.xml b/samples/Cpp/SimpleGame/proj.android/res/values/strings.xml
deleted file mode 100644
index f197c895b7..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">SimpleGame</string>
-</resources>
diff --git a/samples/Cpp/SimpleGame/proj.android/run.sh b/samples/Cpp/SimpleGame/proj.android/run.sh
deleted file mode 100755
index 6f21bffa98..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/run.sh
+++ /dev/null
@@ -1 +0,0 @@
-~/bin/android-sdk/platform-tools/adb shell am start org.cocos2dx.simplegame/android.app.NativeActivity
diff --git a/samples/Cpp/SimpleGame/proj.android/src/org/cocos2dx/simplegame/Cocos2dxActivity.java b/samples/Cpp/SimpleGame/proj.android/src/org/cocos2dx/simplegame/Cocos2dxActivity.java
deleted file mode 100644
index 09065bdd15..0000000000
--- a/samples/Cpp/SimpleGame/proj.android/src/org/cocos2dx/simplegame/Cocos2dxActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.cocos2dx.simplegame;
-
-import android.app.NativeActivity;
-import android.graphics.PixelFormat;
-import android.os.Bundle;
-
-public class Cocos2dxActivity extends NativeActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		// TODO Auto-generated method stub
-		super.onCreate(savedInstanceState);
-		
-		//For supports translucency
-		
-		//1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp
-		/*const EGLint attribs[] = {
-	            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-	            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,  
-	            //EGL_BLUE_SIZE, 5,   -->delete 
-	            //EGL_GREEN_SIZE, 6,  -->delete 
-	            //EGL_RED_SIZE, 5,    -->delete 
-	            EGL_BUFFER_SIZE, 32,  //-->new field
-	            EGL_DEPTH_SIZE, 16,
-	            EGL_STENCIL_SIZE, 8,
-	            EGL_NONE
-	    };*/
-		
-		//2.Set the format of window
-		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
-		
-	}
-}
diff --git a/samples/Cpp/SimpleGame/proj.ios/AppController.h b/samples/Cpp/SimpleGame/proj.ios/AppController.h
deleted file mode 100644
index 3d51064ca0..0000000000
--- a/samples/Cpp/SimpleGame/proj.ios/AppController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010 cocos2d-x.org
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-@class RootViewController;
-
-@interface AppController : NSObject <UIAccelerometerDelegate, UIAlertViewDelegate, UITextFieldDelegate,UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
-}
-
-@end
-
diff --git a/samples/Cpp/SimpleGame/proj.ios/SimpleGame_Prefix.pch b/samples/Cpp/SimpleGame/proj.ios/SimpleGame_Prefix.pch
deleted file mode 100644
index b8914281d2..0000000000
--- a/samples/Cpp/SimpleGame/proj.ios/SimpleGame_Prefix.pch
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'HelloWorld' target in the 'HelloWorld' project
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-    #import <UIKit/UIKit.h>
-#endif
diff --git a/samples/Cpp/SimpleGame/proj.ios/main.m b/samples/Cpp/SimpleGame/proj.ios/main.m
deleted file mode 100644
index bd577a036e..0000000000
--- a/samples/Cpp/SimpleGame/proj.ios/main.m
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  main.m
-//  iphone
-//
-//  Created by Walzer on 10-11-16.
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppController");
-    [pool release];
-    return retVal;
-}
diff --git a/samples/Cpp/SimpleGame/proj.linux/main.cpp b/samples/Cpp/SimpleGame/proj.linux/main.cpp
deleted file mode 100644
index 33e1052ebd..0000000000
--- a/samples/Cpp/SimpleGame/proj.linux/main.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "../Classes/AppDelegate.h"
-#include "cocos2d.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string>
-
-USING_NS_CC;
-
-int main(int argc, char **argv)
-{
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("SimpleGame",900,640);
-    return Application::getInstance()->run();
-}
diff --git a/samples/Cpp/SimpleGame/proj.mac/SampleGame_Prefix.pch b/samples/Cpp/SimpleGame/proj.mac/SampleGame_Prefix.pch
deleted file mode 100644
index 46c36a7e99..0000000000
--- a/samples/Cpp/SimpleGame/proj.mac/SampleGame_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'Paralaxer' target in the 'Paralaxer' project
-//
-
-#ifdef __OBJC__
-	#import <Cocoa/Cocoa.h>
-#endif
diff --git a/samples/Cpp/SimpleGame/proj.mac/en.lproj/MainMenu.xib b/samples/Cpp/SimpleGame/proj.mac/en.lproj/MainMenu.xib
deleted file mode 100644
index 07f04dbab1..0000000000
--- a/samples/Cpp/SimpleGame/proj.mac/en.lproj/MainMenu.xib
+++ /dev/null
@@ -1,812 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-			<string>NSMenuItem</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">SampleGame</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">SampleGame</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About SampleGame</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="609285721">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Preferences…</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="481834944">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-										</object>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide HelloCpp</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit HelloCpp</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="204933491">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Toggle Fullscreen</string>
-									<string key="NSKeyEquiv">f</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="448692316">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="992780483">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="105068016">
-									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">SampleGame Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">495</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="105068016"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFullScreen:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="204933491"/>
-					</object>
-					<int key="connectionID">537</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713487014"/>
-							<reference ref="694149608"/>
-							<reference ref="586577488"/>
-							<reference ref="448692316"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="835318025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110575045"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="609285721"/>
-							<reference ref="481834944"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-						</object>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="609285721"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="481834944"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752062318"/>
-						</object>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="299356726"/>
-							<reference ref="625202149"/>
-							<reference ref="575023229"/>
-							<reference ref="1011231497"/>
-						</object>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="466310130"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="204933491"/>
-						</object>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="448692316"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="992780483"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="992780483"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="105068016"/>
-						</object>
-						<reference key="parent" ref="448692316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="105068016"/>
-						<reference key="parent" ref="992780483"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">536</int>
-						<reference key="object" ref="204933491"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>129.IBPluginDependency</string>
-					<string>130.IBPluginDependency</string>
-					<string>131.IBPluginDependency</string>
-					<string>134.IBPluginDependency</string>
-					<string>136.IBPluginDependency</string>
-					<string>143.IBPluginDependency</string>
-					<string>144.IBPluginDependency</string>
-					<string>145.IBPluginDependency</string>
-					<string>149.IBPluginDependency</string>
-					<string>150.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>23.IBPluginDependency</string>
-					<string>236.IBPluginDependency</string>
-					<string>239.IBPluginDependency</string>
-					<string>24.IBPluginDependency</string>
-					<string>29.IBPluginDependency</string>
-					<string>295.IBPluginDependency</string>
-					<string>296.IBPluginDependency</string>
-					<string>420.IBPluginDependency</string>
-					<string>490.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>492.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>536.IBPluginDependency</string>
-					<string>56.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>92.IBPluginDependency</string>
-				</object>
-				<object class="NSArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">541</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">exitFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>EAGLView</string>
-							<string>NSWindow</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">glView</string>
-								<string key="candidateClassName">EAGLView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">window</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">EAGLView</string>
-					<string key="superclassName">NSOpenGLView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/EAGLView.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{11, 11}</string>
-				<string>{10, 3}</string>
-			</object>
-		</object>
-	</data>
-</archive>
diff --git a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj b/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj
deleted file mode 100644
index cb3c74751e..0000000000
--- a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E0E282F4-8487-452C-BFAB-CB960EB4D22F}</ProjectGuid>
-    <RootNamespace>SimpleGame</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\Classes;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>libcocos2d.lib;libchipmunk.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\Classes;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>libcocos2d.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PostBuildEvent>
-      <Command>
-      </Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Classes\AppDelegate.cpp" />
-    <ClCompile Include="..\Classes\GameOverScene.cpp" />
-    <ClCompile Include="..\Classes\HelloWorldScene.cpp" />
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Classes\AppDelegate.h" />
-    <ClInclude Include="..\Classes\GameOverScene.h" />
-    <ClInclude Include="..\Classes\HelloWorldScene.h" />
-    <ClInclude Include="main.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
-      <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
-      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.filters b/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.filters
deleted file mode 100644
index cf39562aaa..0000000000
--- a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.filters
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Classes">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="win32">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Classes\AppDelegate.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\HelloWorldScene.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\GameOverScene.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Classes\AppDelegate.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\HelloWorldScene.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-    <ClInclude Include="main.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\GameOverScene.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.user b/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.user
deleted file mode 100644
index 32a6296820..0000000000
--- a/samples/Cpp/SimpleGame/proj.win32/SimpleGame.vcxproj.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Cpp/SimpleGame/proj.win32/main.cpp b/samples/Cpp/SimpleGame/proj.win32/main.cpp
deleted file mode 100644
index d819bb02e0..0000000000
--- a/samples/Cpp/SimpleGame/proj.win32/main.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "main.h"
-#include "../Classes/AppDelegate.h"
-#include "CCEGLView.h"
-
-USING_NS_CC;
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("SimpleGame",900,640);
-    return Application::getInstance()->run();
-}
diff --git a/samples/Cpp/SimpleGame/proj.win32/main.h b/samples/Cpp/SimpleGame/proj.win32/main.h
deleted file mode 100644
index e74708bdf2..0000000000
--- a/samples/Cpp/SimpleGame/proj.win32/main.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-
-// Windows Header Files:
-#include <windows.h>
-#include <tchar.h>
-
-// C RunTime Header Files
-#include "CCStdC.h"
-
-#endif    // __MAIN_H__
diff --git a/samples/Cpp/TestCpp/.cproject b/samples/Cpp/TestCpp/.cproject
deleted file mode 100644
index fc4e7a2557..0000000000
--- a/samples/Cpp/TestCpp/.cproject
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="0.756827735">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.756827735" moduleId="org.eclipse.cdt.core.settings" name="Default">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.CWDLocator" id="0.756827735" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-					<folderInfo id="0.756827735." name="/" resourcePath="">
-						<toolChain errorParsers="" id="org.eclipse.cdt.build.core.prefbase.toolchain.294545719" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.294545719.993860072" name=""/>
-							<builder arguments="${ProjDirPath}/build_native.sh" buildPath="${ProjDirPath}" command="/bin/bash" enabledIncrementalBuild="true" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="org.eclipse.cdt.build.core.settings.default.builder.1648661634" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" stopOnErr="true" superClass="org.eclipse.cdt.build.core.settings.default.builder">
-								<outputEntries>
-									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name=""/>
-								</outputEntries>
-							</builder>
-							<tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.libs.1844369373" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs">
-								<option id="org.eclipse.cdt.build.core.settings.holder.libfiles.628519629" name="Library Files" superClass="org.eclipse.cdt.build.core.settings.holder.libfiles" valueType="libFiles">
-									<listOptionValue builtIn="false" srcPrefixMapping="" srcRootPath="" value="../libcocos2dx.a"/>
-								</option>
-								<option id="org.eclipse.cdt.build.core.settings.holder.libpaths.1705781501" name="Library Paths" superClass="org.eclipse.cdt.build.core.settings.holder.libpaths" valueType="libPaths">
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a"/>
-								</option>
-							</tool>
-							<tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.991472034" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1413805376" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/jni&quot;"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/lib/gcc/arm-linux-androideabi/4.4.3/include"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx/include"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/system/include"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/platforms/android-8/arch-arm/usr/include"/>
-								</option>
-								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1267721019" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="COCOS2DX_ROOT=${ProjDirPath}/../../../../"/>
-								</option>
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1052916547" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.2035290044" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.898748423" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/lib/gcc/arm-linux-androideabi/4.4.3/include"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx/include"/>
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/jni&quot;"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/include"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi-v7a/include"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/stlport/stlport"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/platforms/android-8/arch-arm/usr/include"/>
-								</option>
-								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1267721019" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="COCOS2DX_ROOT=${ProjDirPath}/../../../../"/>
-								</option>
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.944632859" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool errorParsers="org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser" id="org.eclipse.cdt.build.core.settings.holder.731367497" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<option id="org.eclipse.cdt.build.core.settings.holder.incpaths.1548475709" name="Include Paths" superClass="org.eclipse.cdt.build.core.settings.holder.incpaths" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/jni&quot;"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx/include"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/lib/gcc/arm-linux-androideabi/4.4.3/include"/>
-									<listOptionValue builtIn="false" value="${ProjDirPath}/../../../../cocos2dx"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/sources/cxx-stl/stlport/stlport"/>
-									<listOptionValue builtIn="false" value="${NDK_ROOT}/platforms/android-8/arch-arm/usr/include"/>
-								</option>
-								<option id="org.eclipse.cdt.build.core.settings.holder.symbols.1267721019" name="Symbols" superClass="org.eclipse.cdt.build.core.settings.holder.symbols" valueType="definedSymbols">
-									<listOptionValue builtIn="false" value="COCOS2DX_ROOT=${ProjDirPath}/../../../../"/>
-								</option>
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1615206779" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-					<sourceEntries>
-						<entry excluding="cocos2dx|scripting|extensions|Classes" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="cocos2dx"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="scripting"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="extensions"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Classes"/>
-
-					</sourceEntries>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="MyProject.null.190811507" name="MyProject"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="0.756827735">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Default">
-			<resource resourceType="PROJECT" workspacePath="/HelloCpp"/>
-		</configuration>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-</cproject>
diff --git a/samples/Cpp/TestCpp/.externalToolBuilders/Javah_jni_builder.launch b/samples/Cpp/TestCpp/.externalToolBuilders/Javah_jni_builder.launch
deleted file mode 100644
index 3506e4e944..0000000000
--- a/samples/Cpp/TestCpp/.externalToolBuilders/Javah_jni_builder.launch
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MyProject/jni&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/javah"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-verbose&#10;-d jni&#10;-classpath ${project_loc}/bin/classes&#10;com.myproject.MyActivity"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}"/>
-</launchConfiguration>
diff --git a/samples/Cpp/TestCpp/Resources/.gitignore b/samples/Cpp/TestCpp/Resources/.gitignore
deleted file mode 100644
index 1d65afe366..0000000000
--- a/samples/Cpp/TestCpp/Resources/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#Do now ignore  Marmalade icf files
-!*.icf
diff --git a/samples/Cpp/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id b/samples/Cpp/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id
deleted file mode 100644
index 584ed4de8a..0000000000
--- a/samples/Cpp/TestCpp/Resources/background-music-aac.wav.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-db5624cd760ef3e8dfad2f751d94fac652d6667f
\ No newline at end of file
diff --git a/samples/Cpp/TestCpp/proj.android/.classpath b/samples/Cpp/TestCpp/proj.android/.classpath
deleted file mode 100644
index c06dfcb8e5..0000000000
--- a/samples/Cpp/TestCpp/proj.android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/samples/Cpp/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch b/samples/Cpp/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch
deleted file mode 100644
index 3506e4e944..0000000000
--- a/samples/Cpp/TestCpp/proj.android/.externalToolBuilders/Javah_jni_builder.launch
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MyProject/jni&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/javah"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-verbose&#10;-d jni&#10;-classpath ${project_loc}/bin/classes&#10;com.myproject.MyActivity"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}"/>
-</launchConfiguration>
diff --git a/samples/Cpp/TestCpp/proj.android/.project b/samples/Cpp/TestCpp/proj.android/.project
deleted file mode 100644
index dd5dee2a3b..0000000000
--- a/samples/Cpp/TestCpp/proj.android/.project
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>TestCpp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Classes</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/samples/Cpp/TestCpp/Classes</locationURI>
-		</link>
-		<link>
-			<name>cocos2dx</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/cocos2dx</locationURI>
-		</link>
-		<link>
-			<name>cocosdenshion</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/CocosDenshion</locationURI>
-		</link>
-		<link>
-			<name>extensions</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/extensions</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/samples/Cpp/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Cpp/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Cpp/TestCpp/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Cpp/TestCpp/proj.android/README.md b/samples/Cpp/TestCpp/proj.android/README.md
deleted file mode 100644
index 312835611a..0000000000
--- a/samples/Cpp/TestCpp/proj.android/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-## Prerequisites:
-
-* Android NDK
-* Android SDK **OR** Eclipse ADT Bundle
-* Android AVD target installed
-
-## Building project
-
-There are two ways of building Android projects.
-
-1. Eclipse
-2. Command Line
-
-### Import Project in Eclipse
-
-#### Features:
-
-1. Complete workflow from Eclipse, including:
-	* Build C++.
-	* Clean C++.
-	* Build and Run whole project.
-	* Logcat view.
-	* Debug Java code.
-	* Javascript editor.
-	* Project management.
-2. True C++ editing, including:
-	* Code completion. 
-	* Jump to definition.
-	* Refactoring tools etc. 
-	* Quick open C++ files.
-
-
-#### Setup Eclipse Environment (only once)
-
-
-**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before.
-
-1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html)
-
-   **OR**
-
-   Install Eclipse with Java. Add ADT and CDT plugins.
-
-2. Only for Windows
-    1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install).
-    2. Add `Cygwin\bin` directory to system PATH variable.
-    3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file.
-   
-3. Set up Variables: 
-	1. Path Variable `COCOS2DX`: 
-		* Eclipse->Preferences->General->Workspace->**Linked Resources**
-		* Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory.
-		![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png)
-
-	2. C/C++ Environment Variable `NDK_ROOT`: 
-		* Eclipse->Preferences->C/C++->Build->**Environment**.
-		* Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory.
-		![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png)
-		* Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr`
-		
-4. Import libcocos2dx library project:
-	1. File->New->Project->Android Project From Existing Code.
-	2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory.
-	3. Click **Finish** to add project.
-	
-#### Adding and running from Eclipse
-
-![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png)
-
-1. File->New->Project->Android Project From Existing Code
-2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/`
-3. Add the project 
-4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator.
-
-
-### Running project from Command Line
-
-    $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/
-    $ export NDK_ROOT=/path/to/ndk
-    $ ./build_native.sh
-    $ ant debug install
-
-If the last command results in sdk.dir missing error then do: 
-
-    $ android list target
-    $ android update project -p . -t (id from step 6)
-    $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6)
diff --git a/samples/Cpp/TestCpp/proj.android/ant.properties b/samples/Cpp/TestCpp/proj.android/ant.properties
deleted file mode 100644
index b0971e891e..0000000000
--- a/samples/Cpp/TestCpp/proj.android/ant.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
diff --git a/samples/Cpp/TestCpp/proj.win32/main.h b/samples/Cpp/TestCpp/proj.win32/main.h
deleted file mode 100644
index e74708bdf2..0000000000
--- a/samples/Cpp/TestCpp/proj.win32/main.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-
-// Windows Header Files:
-#include <windows.h>
-#include <tchar.h>
-
-// C RunTime Header Files
-#include "CCStdC.h"
-
-#endif    // __MAIN_H__
diff --git a/samples/Javascript/CocosDragonJS/proj.android/.project b/samples/Javascript/CocosDragonJS/proj.android/.project
deleted file mode 100644
index 0a52fa2ab9..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/.project
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>CocosDragonJS</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Classes</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/samples/Javascript/CocosDragonJS/Classes</locationURI>
-		</link>
-		<link>
-			<name>cocos2dx</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/cocos2dx</locationURI>
-		</link>
-		<link>
-			<name>cocosdenshion</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/CocosDenshion</locationURI>
-		</link>
-		<link>
-			<name>extensions</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/extensions</locationURI>
-		</link>
-		<link>
-			<name>scripting</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/scripting</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/samples/Javascript/CocosDragonJS/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/CocosDragonJS/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml b/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml
deleted file mode 100644
index a215673a7c..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.cocos2dx.cocosdragonjs"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-feature android:glEsVersion="0x00020000" />
-
-    <application android:label="@string/app_name"
-        android:icon="@drawable/icon">
-
-        <activity android:name=".Cocos2dxActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="portrait"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation">
-
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name="android.app.lib_name"
-                       android:value="cocosdragonjs" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <supports-screens android:anyDensity="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:xlargeScreens="true"/>
-</manifest> 
diff --git a/samples/Javascript/CocosDragonJS/proj.android/README.md b/samples/Javascript/CocosDragonJS/proj.android/README.md
deleted file mode 100644
index 312835611a..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-## Prerequisites:
-
-* Android NDK
-* Android SDK **OR** Eclipse ADT Bundle
-* Android AVD target installed
-
-## Building project
-
-There are two ways of building Android projects.
-
-1. Eclipse
-2. Command Line
-
-### Import Project in Eclipse
-
-#### Features:
-
-1. Complete workflow from Eclipse, including:
-	* Build C++.
-	* Clean C++.
-	* Build and Run whole project.
-	* Logcat view.
-	* Debug Java code.
-	* Javascript editor.
-	* Project management.
-2. True C++ editing, including:
-	* Code completion. 
-	* Jump to definition.
-	* Refactoring tools etc. 
-	* Quick open C++ files.
-
-
-#### Setup Eclipse Environment (only once)
-
-
-**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before.
-
-1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html)
-
-   **OR**
-
-   Install Eclipse with Java. Add ADT and CDT plugins.
-
-2. Only for Windows
-    1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install).
-    2. Add `Cygwin\bin` directory to system PATH variable.
-    3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file.
-   
-3. Set up Variables: 
-	1. Path Variable `COCOS2DX`: 
-		* Eclipse->Preferences->General->Workspace->**Linked Resources**
-		* Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory.
-		![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png)
-
-	2. C/C++ Environment Variable `NDK_ROOT`: 
-		* Eclipse->Preferences->C/C++->Build->**Environment**.
-		* Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory.
-		![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png)
-		* Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr`
-		
-4. Import libcocos2dx library project:
-	1. File->New->Project->Android Project From Existing Code.
-	2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory.
-	3. Click **Finish** to add project.
-	
-#### Adding and running from Eclipse
-
-![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png)
-
-1. File->New->Project->Android Project From Existing Code
-2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/`
-3. Add the project 
-4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator.
-
-
-### Running project from Command Line
-
-    $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/
-    $ export NDK_ROOT=/path/to/ndk
-    $ ./build_native.sh
-    $ ant debug install
-
-If the last command results in sdk.dir missing error then do: 
-
-    $ android list target
-    $ android update project -p . -t (id from step 6)
-    $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6)
diff --git a/samples/Javascript/CocosDragonJS/proj.android/build.xml b/samples/Javascript/CocosDragonJS/proj.android/build.xml
deleted file mode 100644
index b5b34f9013..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="CocosDragonJS" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk b/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk
deleted file mode 100644
index 1e65b8e7a5..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/jni/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := cocosdragonjs_shared
-
-LOCAL_MODULE_FILENAME := libcocosdragonjs
-
-LOCAL_SRC_FILES := cocosdragonjs/main.cpp \
-                   ../../Classes/AppDelegate.cpp
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static
-
-LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,scripting/javascript/bindings)
-$(call import-module,scripting/javascript/bindings/chipmunk)
-$(call import-module,scripting/javascript/bindings/extension)
-$(call import-module,scripting/javascript/bindings/localstorage)
-$(call import-module,scripting/javascript/bindings/network)
-$(call import-module,scripting/javascript/bindings/cocosbuilder)
-
diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk b/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk
deleted file mode 100644
index 3666985a1f..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/jni/Application.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-APP_STL := gnustl_static
-
-# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
-# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
-
diff --git a/samples/Javascript/CocosDragonJS/proj.android/ndkgdb.sh b/samples/Javascript/CocosDragonJS/proj.android/ndkgdb.sh
deleted file mode 100755
index 779acc425f..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/ndkgdb.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-APPNAME="CocosDragonJS"
-APP_ANDROID_NAME="org.cocos2dx.cocosdragonjs"
-
-if [ -z "${SDK_ROOT+aaa}" ]; then
-# ... if SDK_ROOT is not set, use "$HOME/bin/android-sdk"
-    SDK_ROOT="$HOME/bin/android-sdk"
-fi
-
-if [ -z "${NDK_ROOT+aaa}" ]; then
-# ... if NDK_ROOT is not set, use "$HOME/bin/android-ndk"
-    NDK_ROOT="$HOME/bin/android-ndk"
-fi
-
-if [ -z "${COCOS2DX_ROOT+aaa}" ]; then
-# ... if COCOS2DX_ROOT is not set
-# ... find current working directory
-    DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# ... use paths relative to current directory
-    COCOS2DX_ROOT="$DIR/../../.."
-    APP_ROOT="$DIR/.."
-    APP_ANDROID_ROOT="$DIR"
-else
-    APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME"
-    APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android"
-fi
-
-echo "NDK_ROOT = $NDK_ROOT"
-echo "SDK_ROOT = $SDK_ROOT"
-echo "COCOS2DX_ROOT = $COCOS2DX_ROOT"
-echo "APP_ROOT = $APP_ROOT"
-echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT"
-echo "APP_ANDROID_NAME = $APP_ANDROID_NAME"
-
-echo
-echo "Killing and restarting ${APP_ANDROID_NAME}"
-echo
-
-set -x
-
-"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}"
-
-NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \
-    "${NDK_ROOT}"/ndk-gdb \
-    --adb="${SDK_ROOT}"/platform-tools/adb \
-    --verbose \
-    --start \
-    --force
diff --git a/samples/Javascript/CocosDragonJS/proj.android/proguard-project.txt b/samples/Javascript/CocosDragonJS/proj.android/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/samples/Javascript/CocosDragonJS/proj.android/res/values/strings.xml b/samples/Javascript/CocosDragonJS/proj.android/res/values/strings.xml
deleted file mode 100644
index 1cc07c9cad..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">CocosDragonJS</string>
-</resources>
diff --git a/samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/Cocos2dxActivity.java b/samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/Cocos2dxActivity.java
deleted file mode 100644
index bde3e3a5a0..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.android/src/org/cocos2dx/cocosdragonjs/Cocos2dxActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.cocos2dx.cocosdragonjs;
-
-import android.app.NativeActivity;
-import android.graphics.PixelFormat;
-import android.os.Bundle;
-
-public class Cocos2dxActivity extends NativeActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		// TODO Auto-generated method stub
-		super.onCreate(savedInstanceState);
-		
-		//For supports translucency
-		
-		//1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp
-		/*const EGLint attribs[] = {
-	            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-	            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,  
-	            //EGL_BLUE_SIZE, 5,   -->delete 
-	            //EGL_GREEN_SIZE, 6,  -->delete 
-	            //EGL_RED_SIZE, 5,    -->delete 
-	            EGL_BUFFER_SIZE, 32,  //-->new field
-	            EGL_DEPTH_SIZE, 16,
-	            EGL_STENCIL_SIZE, 8,
-	            EGL_NONE
-	    };*/
-		
-		//2.Set the format of window
-		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
-		
-	}
-}
diff --git a/samples/Javascript/CocosDragonJS/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/CocosDragonJS/proj.ios/Default-568h@2x.png.REMOVED.git-id
deleted file mode 100644
index 8f5838f3a8..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.ios/Default-568h@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-66c6d1cead373b45218424f6a82f370897e443e4
\ No newline at end of file
diff --git a/samples/Javascript/CocosDragonJS/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/CocosDragonJS/proj.ios/Default@2x.png.REMOVED.git-id
deleted file mode 100644
index 8843505b20..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.ios/Default@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-84689888a14a2123d2b39f7f2f61be8c15207479
\ No newline at end of file
diff --git a/samples/Javascript/CocosDragonJS/proj.ios/RootViewController.h b/samples/Javascript/CocosDragonJS/proj.ios/RootViewController.h
deleted file mode 100644
index 11dfc4bf88..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.ios/RootViewController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-
-@interface RootViewController : UIViewController {
-
-}
-- (BOOL)prefersStatusBarHidden;
-@end
diff --git a/samples/Javascript/CocosDragonJS/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/CocosDragonJS/proj.mac/Icon.icns.REMOVED.git-id
deleted file mode 100644
index 9874ec6979..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.mac/Icon.icns.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0
\ No newline at end of file
diff --git a/samples/Javascript/CocosDragonJS/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/CocosDragonJS/proj.mac/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.mac/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj b/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
deleted file mode 100644
index 2e7cc9a5d5..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{68ED0B4E-2BCA-45D2-9648-CEABEBD3B9D7}</ProjectGuid>
-    <RootNamespace>CocosDragonJS</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\CocosDragonJSRes" rd /s /q "$(OutDir)\CocosDragonJSRes"
-mkdir "$(OutDir)\CocosDragonJSRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\CocosDragonJSRes" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\games\CocosDragonJS\Published files Android" "$(OutDir)\CocosDragonJSRes\" /e /Y</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_JAVASCRIPT=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\CocosDragonJSRes" rd /s /q "$(OutDir)\CocosDragonJSRes"
-mkdir "$(OutDir)\CocosDragonJSRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\CocosDragonJSRes" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\games\CocosDragonJS\Published files Android" "$(OutDir)\CocosDragonJSRes\" /e /Y</Command>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="..\Classes\AppDelegate.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="main.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="..\Classes\AppDelegate.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\testjs.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testjs.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
-      <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
-      <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\chipmunk\libJSBindingForChipmunk.vcxproj">
-      <Project>{21070e58-eec6-4e16-8b4f-6d083df55790}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj">
-      <Project>{f9da0fc1-651b-457b-962e-a4d61cebf5fd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\extension\libJSBindingForExtension.vcxproj">
-      <Project>{625f7391-9a91-48a1-8cfc-79508c822637}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\localstorage\libJSBindingForLocalStorage.vcxproj">
-      <Project>{68f5f371-bd7b-4c30-ae5b-0b08f22e0cde}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj">
-      <Project>{39379840-825a-45a0-b363-c09ffef864bd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
-      <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
-      <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
-      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.filters b/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.filters
deleted file mode 100644
index 56df37ce6f..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.filters
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="resource">
-      <UniqueIdentifier>{ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest</Extensions>
-    </Filter>
-    <Filter Include="win32">
-      <UniqueIdentifier>{ccb2323b-1cfa-41ea-bcf4-ba5f07309396}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Classes">
-      <UniqueIdentifier>{e93a77e1-af1e-4400-87d3-504b62ebdbb0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\AppDelegate.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="main.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\AppDelegate.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\testjs.ico">
-      <Filter>resource</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testjs.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.user b/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.user
deleted file mode 100644
index 9d1dc0a360..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\CocosDragonJSRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\CocosDragonJSRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/CocosDragonJS/proj.win32/main.cpp b/samples/Javascript/CocosDragonJS/proj.win32/main.cpp
deleted file mode 100644
index 32adc1cd52..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.win32/main.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "main.h"
-#include "AppDelegate.h"
-#include "CCEGLView.h"
-
-USING_NS_CC;
-
-// uncomment below line, open debug console
-// #define USE_WIN32_CONSOLE
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-
-#ifdef USE_WIN32_CONSOLE
-    AllocConsole();
-    freopen("CONIN$", "r", stdin);
-    freopen("CONOUT$", "w", stdout);
-    freopen("CONOUT$", "w", stderr);
-#endif
-
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("CocosDragonJS", 480, 720);
-
-    int ret = Application::getInstance()->run();
-
-#ifdef USE_WIN32_CONSOLE
-    FreeConsole();
-#endif
-
-    return ret;
-}
diff --git a/samples/Javascript/CocosDragonJS/proj.win32/main.h b/samples/Javascript/CocosDragonJS/proj.win32/main.h
deleted file mode 100644
index e29aeedb3a..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.win32/main.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-
-// Windows Header Files:
-#include <tchar.h>
-
-// C RunTime Header Files
-#include "CCStdC.h"
-
-#endif    // __WINMAIN_H__
diff --git a/samples/Javascript/CocosDragonJS/proj.win32/resource.h b/samples/Javascript/CocosDragonJS/proj.win32/resource.h
deleted file mode 100644
index a4cfa38af8..0000000000
--- a/samples/Javascript/CocosDragonJS/proj.win32/resource.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by testjs.RC
-//
-
-#define IDS_PROJNAME                100
-#define IDR_TESTJS    100
-
-#define ID_FILE_NEW_WINDOW            32771
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE    201
-#define _APS_NEXT_CONTROL_VALUE        1000
-#define _APS_NEXT_SYMED_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE        32775
-#endif
-#endif
diff --git a/samples/Javascript/CrystalCraze/Classes/AppDelegate.h b/samples/Javascript/CrystalCraze/Classes/AppDelegate.h
deleted file mode 100644
index df8f12f70f..0000000000
--- a/samples/Javascript/CrystalCraze/Classes/AppDelegate.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  GCTestAppDelegate.h
-//  GCTest
-//
-//  Created by Rohan Kuruvilla on 06/08/2012.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#ifndef  _APP_DELEGATE_H_
-#define  _APP_DELEGATE_H_
-
-#include "CCApplication.h"
-/**
- @brief    The cocos2d Application.
- 
- The reason for implement as private inheritance is to hide some interface call by Director.
- */
-class  AppDelegate : private cocos2d::Application
-{
-public:
-    AppDelegate();
-    virtual ~AppDelegate();
-    
-    /**
-     @brief    Implement Director and Scene init code here.
-     @return true    Initialize success, app continue.
-     @return false   Initialize failed, app terminate.
-     */
-    virtual bool applicationDidFinishLaunching();
-    
-    /**
-     @brief  The function be called when the application enter background
-     @param  the pointer of the application
-     */
-    virtual void applicationDidEnterBackground();
-    
-    /**
-     @brief  The function be called when the application enter foreground
-     @param  the pointer of the application
-     */
-    virtual void applicationWillEnterForeground();
-};
-
-#endif // _APP_DELEGATE_H_
-
diff --git a/samples/Javascript/CrystalCraze/proj.android/.classpath b/samples/Javascript/CrystalCraze/proj.android/.classpath
deleted file mode 100644
index 0b08408342..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/samples/Javascript/CrystalCraze/proj.android/.project b/samples/Javascript/CrystalCraze/proj.android/.project
deleted file mode 100644
index 48f68239f6..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/.project
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>CrystalCraze</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Classes</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/samples/Javascript/CrystalCraze/Classes</locationURI>
-		</link>
-		<link>
-			<name>cocos2dx</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/cocos2dx</locationURI>
-		</link>
-		<link>
-			<name>cocosdenshion</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/CocosDenshion</locationURI>
-		</link>
-		<link>
-			<name>extensions</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/extensions</locationURI>
-		</link>
-		<link>
-			<name>scripting</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/scripting</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/samples/Javascript/CrystalCraze/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/CrystalCraze/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml b/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml
deleted file mode 100644
index 25c83ab747..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.cocos2dx.crystalcraze"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-feature android:glEsVersion="0x00020000" />
-
-    <application android:label="@string/app_name"
-        android:icon="@drawable/icon">
-
-        <activity android:name=".Cocos2dxActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="portrait"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation">
-
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name="android.app.lib_name"
-                       android:value="crystalcraze" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <supports-screens android:anyDensity="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:xlargeScreens="true"/>
-</manifest> 
diff --git a/samples/Javascript/CrystalCraze/proj.android/README.md b/samples/Javascript/CrystalCraze/proj.android/README.md
deleted file mode 100644
index 312835611a..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-## Prerequisites:
-
-* Android NDK
-* Android SDK **OR** Eclipse ADT Bundle
-* Android AVD target installed
-
-## Building project
-
-There are two ways of building Android projects.
-
-1. Eclipse
-2. Command Line
-
-### Import Project in Eclipse
-
-#### Features:
-
-1. Complete workflow from Eclipse, including:
-	* Build C++.
-	* Clean C++.
-	* Build and Run whole project.
-	* Logcat view.
-	* Debug Java code.
-	* Javascript editor.
-	* Project management.
-2. True C++ editing, including:
-	* Code completion. 
-	* Jump to definition.
-	* Refactoring tools etc. 
-	* Quick open C++ files.
-
-
-#### Setup Eclipse Environment (only once)
-
-
-**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before.
-
-1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html)
-
-   **OR**
-
-   Install Eclipse with Java. Add ADT and CDT plugins.
-
-2. Only for Windows
-    1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install).
-    2. Add `Cygwin\bin` directory to system PATH variable.
-    3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file.
-   
-3. Set up Variables: 
-	1. Path Variable `COCOS2DX`: 
-		* Eclipse->Preferences->General->Workspace->**Linked Resources**
-		* Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory.
-		![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png)
-
-	2. C/C++ Environment Variable `NDK_ROOT`: 
-		* Eclipse->Preferences->C/C++->Build->**Environment**.
-		* Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory.
-		![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png)
-		* Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr`
-		
-4. Import libcocos2dx library project:
-	1. File->New->Project->Android Project From Existing Code.
-	2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory.
-	3. Click **Finish** to add project.
-	
-#### Adding and running from Eclipse
-
-![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png)
-
-1. File->New->Project->Android Project From Existing Code
-2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/`
-3. Add the project 
-4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator.
-
-
-### Running project from Command Line
-
-    $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/
-    $ export NDK_ROOT=/path/to/ndk
-    $ ./build_native.sh
-    $ ant debug install
-
-If the last command results in sdk.dir missing error then do: 
-
-    $ android list target
-    $ android update project -p . -t (id from step 6)
-    $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6)
diff --git a/samples/Javascript/CrystalCraze/proj.android/ant.properties b/samples/Javascript/CrystalCraze/proj.android/ant.properties
deleted file mode 100644
index f8af38bfb4..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/ant.properties
+++ /dev/null
@@ -1 +0,0 @@
-aapt.ignore.assets="!*.pvr.gz:!*.gz:!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
diff --git a/samples/Javascript/CrystalCraze/proj.android/build.xml b/samples/Javascript/CrystalCraze/proj.android/build.xml
deleted file mode 100644
index 1bb22c3efd..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="CrystalCraze" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk b/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk
deleted file mode 100644
index 9c8854568c..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/jni/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := crystalcraze_shared
-
-LOCAL_MODULE_FILENAME := libcrystalcraze
-
-LOCAL_SRC_FILES := crystalcraze/main.cpp \
-                   ../../Classes/AppDelegate.cpp
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static
-
-LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,scripting/javascript/bindings)
-$(call import-module,scripting/javascript/bindings/chipmunk)
-$(call import-module,scripting/javascript/bindings/extension)
-$(call import-module,scripting/javascript/bindings/localstorage)
-$(call import-module,scripting/javascript/bindings/network)
-$(call import-module,scripting/javascript/bindings/cocosbuilder)
diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk b/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk
deleted file mode 100644
index 3666985a1f..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/jni/Application.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-APP_STL := gnustl_static
-
-# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
-# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
-
diff --git a/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp b/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp
deleted file mode 100644
index 9793beefb1..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "AppDelegate.h"
-#include "cocos2d.h"
-#include "platform/android/jni/JniHelper.h"
-#include "CCEventType.h"
-#include <jni.h>
-#include <android/log.h>
-
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
-
-using namespace cocos2d;
-
-void cocos_android_app_init (struct android_app* app) {
-    LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
-}
diff --git a/samples/Javascript/CrystalCraze/proj.android/ndkgdb.sh b/samples/Javascript/CrystalCraze/proj.android/ndkgdb.sh
deleted file mode 100755
index b62f46024e..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/ndkgdb.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-APPNAME="CrystalCraze"
-APP_ANDROID_NAME="org.cocos2dx.cocosdragonjs"
-
-if [ -z "${SDK_ROOT+aaa}" ]; then
-# ... if SDK_ROOT is not set, use "$HOME/bin/android-sdk"
-    SDK_ROOT="$HOME/bin/android-sdk"
-fi
-
-if [ -z "${NDK_ROOT+aaa}" ]; then
-# ... if NDK_ROOT is not set, use "$HOME/bin/android-ndk"
-    NDK_ROOT="$HOME/bin/android-ndk"
-fi
-
-if [ -z "${COCOS2DX_ROOT+aaa}" ]; then
-# ... if COCOS2DX_ROOT is not set
-# ... find current working directory
-    DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# ... use paths relative to current directory
-    COCOS2DX_ROOT="$DIR/../../.."
-    APP_ROOT="$DIR/.."
-    APP_ANDROID_ROOT="$DIR"
-else
-    APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME"
-    APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android"
-fi
-
-echo "NDK_ROOT = $NDK_ROOT"
-echo "SDK_ROOT = $SDK_ROOT"
-echo "COCOS2DX_ROOT = $COCOS2DX_ROOT"
-echo "APP_ROOT = $APP_ROOT"
-echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT"
-echo "APP_ANDROID_NAME = $APP_ANDROID_NAME"
-
-echo
-echo "Killing and restarting ${APP_ANDROID_NAME}"
-echo
-
-set -x
-
-"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}"
-
-NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \
-    "${NDK_ROOT}"/ndk-gdb \
-    --adb="${SDK_ROOT}"/platform-tools/adb \
-    --verbose \
-    --start \
-    --force
diff --git a/samples/Javascript/CrystalCraze/proj.android/proguard-project.txt b/samples/Javascript/CrystalCraze/proj.android/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/samples/Javascript/CrystalCraze/proj.android/project.properties b/samples/Javascript/CrystalCraze/proj.android/project.properties
deleted file mode 100644
index 0a6dc6664d..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-10
-
-android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/CrystalCraze/proj.android/res/values/strings.xml b/samples/Javascript/CrystalCraze/proj.android/res/values/strings.xml
deleted file mode 100644
index 3e26a6a118..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">CrystalCraze</string>
-</resources>
diff --git a/samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/Cocos2dxActivity.java b/samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/Cocos2dxActivity.java
deleted file mode 100644
index f4dfa7e83b..0000000000
--- a/samples/Javascript/CrystalCraze/proj.android/src/org/cocos2dx/crystalcraze/Cocos2dxActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.cocos2dx.crystalcraze;
-
-import android.app.NativeActivity;
-import android.graphics.PixelFormat;
-import android.os.Bundle;
-
-public class Cocos2dxActivity extends NativeActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		// TODO Auto-generated method stub
-		super.onCreate(savedInstanceState);
-		
-		//For supports translucency
-		
-		//1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp
-		/*const EGLint attribs[] = {
-	            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-	            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,  
-	            //EGL_BLUE_SIZE, 5,   -->delete 
-	            //EGL_GREEN_SIZE, 6,  -->delete 
-	            //EGL_RED_SIZE, 5,    -->delete 
-	            EGL_BUFFER_SIZE, 32,  //-->new field
-	            EGL_DEPTH_SIZE, 16,
-	            EGL_STENCIL_SIZE, 8,
-	            EGL_NONE
-	    };*/
-		
-		//2.Set the format of window
-		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
-		
-	}
-}
diff --git a/samples/Javascript/CrystalCraze/proj.ios/AppController.h b/samples/Javascript/CrystalCraze/proj.ios/AppController.h
deleted file mode 100644
index 10287bd13f..0000000000
--- a/samples/Javascript/CrystalCraze/proj.ios/AppController.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-@class RootViewController;
-
-@interface AppController : NSObject <UIAccelerometerDelegate, UIAlertViewDelegate, UITextFieldDelegate,UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
-}
-
-@end
-
diff --git a/samples/Javascript/CrystalCraze/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/CrystalCraze/proj.ios/Default-568h@2x.png.REMOVED.git-id
deleted file mode 100644
index 8f5838f3a8..0000000000
--- a/samples/Javascript/CrystalCraze/proj.ios/Default-568h@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-66c6d1cead373b45218424f6a82f370897e443e4
\ No newline at end of file
diff --git a/samples/Javascript/CrystalCraze/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/CrystalCraze/proj.ios/Default@2x.png.REMOVED.git-id
deleted file mode 100644
index 8843505b20..0000000000
--- a/samples/Javascript/CrystalCraze/proj.ios/Default@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-84689888a14a2123d2b39f7f2f61be8c15207479
\ No newline at end of file
diff --git a/samples/Javascript/CrystalCraze/proj.ios/Prefix.pch b/samples/Javascript/CrystalCraze/proj.ios/Prefix.pch
deleted file mode 100644
index b056d8694a..0000000000
--- a/samples/Javascript/CrystalCraze/proj.ios/Prefix.pch
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'testjs' target in the 'testjs' project
-//
-
-#ifdef __OBJC__
-	#import <Foundation/Foundation.h>
-	#import <UIKit/UIKit.h>
-#endif
diff --git a/samples/Javascript/CrystalCraze/proj.ios/RootViewController.h b/samples/Javascript/CrystalCraze/proj.ios/RootViewController.h
deleted file mode 100644
index 11dfc4bf88..0000000000
--- a/samples/Javascript/CrystalCraze/proj.ios/RootViewController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-
-@interface RootViewController : UIViewController {
-
-}
-- (BOOL)prefersStatusBarHidden;
-@end
diff --git a/samples/Javascript/CrystalCraze/proj.ios/RootViewController.mm b/samples/Javascript/CrystalCraze/proj.ios/RootViewController.mm
deleted file mode 100644
index 8438d7a420..0000000000
--- a/samples/Javascript/CrystalCraze/proj.ios/RootViewController.mm
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import "RootViewController.h"
-
-
-@implementation RootViewController
-
-/*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-/*
-// Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
-}
-*/
-
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
- 
-*/
-// Override to allow orientations other than the default portrait orientation.
-// This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
-}
-
-// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
-#ifdef __IPHONE_6_0
-    return UIInterfaceOrientationMaskAllButUpsideDown;
-#endif
-}
-
-- (BOOL) shouldAutorotate {
-    return YES;
-}
-
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end
diff --git a/samples/Javascript/CrystalCraze/proj.ios/main.m b/samples/Javascript/CrystalCraze/proj.ios/main.m
deleted file mode 100644
index e3dedca28b..0000000000
--- a/samples/Javascript/CrystalCraze/proj.ios/main.m
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  main.m
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppController");
-    [pool release];
-    return retVal;
-}
diff --git a/samples/Javascript/CrystalCraze/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/CrystalCraze/proj.mac/Icon.icns.REMOVED.git-id
deleted file mode 100644
index 9874ec6979..0000000000
--- a/samples/Javascript/CrystalCraze/proj.mac/Icon.icns.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0
\ No newline at end of file
diff --git a/samples/Javascript/CrystalCraze/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/CrystalCraze/proj.mac/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/samples/Javascript/CrystalCraze/proj.mac/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/samples/Javascript/CrystalCraze/proj.mac/en.lproj/MainMenu.xib b/samples/Javascript/CrystalCraze/proj.mac/en.lproj/MainMenu.xib
deleted file mode 100644
index 3dacdedbd0..0000000000
--- a/samples/Javascript/CrystalCraze/proj.mac/en.lproj/MainMenu.xib
+++ /dev/null
@@ -1,812 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSMenuItem</string>
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">TestCpp</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">TestCpp</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About TestCpp</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="609285721">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Preferences…</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="481834944">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-										</object>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide TestCpp</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit TestCpp</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="204933491">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Toggle Fullscreen</string>
-									<string key="NSKeyEquiv">f</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="448692316">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="992780483">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="105068016">
-									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">TestCpp Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">495</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="105068016"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFullScreen:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="204933491"/>
-					</object>
-					<int key="connectionID">537</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713487014"/>
-							<reference ref="694149608"/>
-							<reference ref="586577488"/>
-							<reference ref="448692316"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="835318025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110575045"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="609285721"/>
-							<reference ref="481834944"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-						</object>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="609285721"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="481834944"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752062318"/>
-						</object>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="299356726"/>
-							<reference ref="625202149"/>
-							<reference ref="575023229"/>
-							<reference ref="1011231497"/>
-						</object>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="466310130"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="204933491"/>
-						</object>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="448692316"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="992780483"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="992780483"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="105068016"/>
-						</object>
-						<reference key="parent" ref="448692316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="105068016"/>
-						<reference key="parent" ref="992780483"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">536</int>
-						<reference key="object" ref="204933491"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>129.IBPluginDependency</string>
-					<string>130.IBPluginDependency</string>
-					<string>131.IBPluginDependency</string>
-					<string>134.IBPluginDependency</string>
-					<string>136.IBPluginDependency</string>
-					<string>143.IBPluginDependency</string>
-					<string>144.IBPluginDependency</string>
-					<string>145.IBPluginDependency</string>
-					<string>149.IBPluginDependency</string>
-					<string>150.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>23.IBPluginDependency</string>
-					<string>236.IBPluginDependency</string>
-					<string>239.IBPluginDependency</string>
-					<string>24.IBPluginDependency</string>
-					<string>29.IBPluginDependency</string>
-					<string>295.IBPluginDependency</string>
-					<string>296.IBPluginDependency</string>
-					<string>420.IBPluginDependency</string>
-					<string>490.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>492.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>536.IBPluginDependency</string>
-					<string>56.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>92.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">541</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">exitFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>EAGLView</string>
-							<string>NSWindow</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">glView</string>
-								<string key="candidateClassName">EAGLView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">window</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">EAGLView</string>
-					<string key="superclassName">NSOpenGLView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/EAGLView.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-			</object>
-		</object>
-	</data>
-</archive>
diff --git a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj b/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj
deleted file mode 100644
index 36fd882002..0000000000
--- a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9A17D9A4-4B11-4E32-94F6-895FF4909EC5}</ProjectGuid>
-    <RootNamespace>CrystalCraze</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\CrystalCrazeRes" rd /s /q "$(OutDir)\CrystalCrazeRes"
-mkdir "$(OutDir)\CrystalCrazeRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\CrystalCrazeRes" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\games\CrystalCraze\Published-Android" "$(OutDir)\CrystalCrazeRes\" /e /Y</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;CC_ENABLE_CHIPMUNK_INTEGRATION=1;COCOS2D_JAVASCRIPT=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\CrystalCrazeRes" rd /s /q "$(OutDir)\CrystalCrazeRes"
-mkdir "$(OutDir)\CrystalCrazeRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\CrystalCrazeRes" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\games\CrystalCraze\Published-Android" "$(OutDir)\CrystalCrazeRes\" /e /Y</Command>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="..\Classes\AppDelegate.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="main.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="..\Classes\AppDelegate.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\testjs.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testjs.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
-      <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
-      <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
-      <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
-      <Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\chipmunk\libJSBindingForChipmunk.vcxproj">
-      <Project>{21070e58-eec6-4e16-8b4f-6d083df55790}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj">
-      <Project>{f9da0fc1-651b-457b-962e-a4d61cebf5fd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\extension\libJSBindingForExtension.vcxproj">
-      <Project>{625f7391-9a91-48a1-8cfc-79508c822637}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\localstorage\libJSBindingForLocalStorage.vcxproj">
-      <Project>{68f5f371-bd7b-4c30-ae5b-0b08f22e0cde}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj">
-      <Project>{39379840-825a-45a0-b363-c09ffef864bd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
-      <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
-      <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
-      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.filters b/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.filters
deleted file mode 100644
index 56df37ce6f..0000000000
--- a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.filters
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="resource">
-      <UniqueIdentifier>{ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest</Extensions>
-    </Filter>
-    <Filter Include="win32">
-      <UniqueIdentifier>{ccb2323b-1cfa-41ea-bcf4-ba5f07309396}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Classes">
-      <UniqueIdentifier>{e93a77e1-af1e-4400-87d3-504b62ebdbb0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\AppDelegate.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="main.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\AppDelegate.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\testjs.ico">
-      <Filter>resource</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testjs.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.user b/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.user
deleted file mode 100644
index 17116bfa9e..0000000000
--- a/samples/Javascript/CrystalCraze/proj.win32/CrystalCraze.vcxproj.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\CrystalCrazeRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\CrystalCrazeRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/CrystalCraze/proj.win32/main.cpp b/samples/Javascript/CrystalCraze/proj.win32/main.cpp
deleted file mode 100644
index 6064ff7dd8..0000000000
--- a/samples/Javascript/CrystalCraze/proj.win32/main.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "main.h"
-#include "AppDelegate.h"
-#include "CCEGLView.h"
-
-USING_NS_CC;
-
-// uncomment below line, open debug console
-// #define USE_WIN32_CONSOLE
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-
-#ifdef USE_WIN32_CONSOLE
-    AllocConsole();
-    freopen("CONIN$", "r", stdin);
-    freopen("CONOUT$", "w", stdout);
-    freopen("CONOUT$", "w", stderr);
-#endif
-
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("CrystalCraze", 480, 720);
-
-    int ret = Application::getInstance()->run();
-
-#ifdef USE_WIN32_CONSOLE
-    FreeConsole();
-#endif
-
-    return ret;
-}
diff --git a/samples/Javascript/CrystalCraze/proj.win32/main.h b/samples/Javascript/CrystalCraze/proj.win32/main.h
deleted file mode 100644
index e29aeedb3a..0000000000
--- a/samples/Javascript/CrystalCraze/proj.win32/main.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-
-// Windows Header Files:
-#include <tchar.h>
-
-// C RunTime Header Files
-#include "CCStdC.h"
-
-#endif    // __WINMAIN_H__
diff --git a/samples/Javascript/CrystalCraze/proj.win32/res/testjs.ico b/samples/Javascript/CrystalCraze/proj.win32/res/testjs.ico
deleted file mode 100644
index feaf932a74..0000000000
Binary files a/samples/Javascript/CrystalCraze/proj.win32/res/testjs.ico and /dev/null differ
diff --git a/samples/Javascript/CrystalCraze/proj.win32/resource.h b/samples/Javascript/CrystalCraze/proj.win32/resource.h
deleted file mode 100644
index a4cfa38af8..0000000000
--- a/samples/Javascript/CrystalCraze/proj.win32/resource.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by testjs.RC
-//
-
-#define IDS_PROJNAME                100
-#define IDR_TESTJS    100
-
-#define ID_FILE_NEW_WINDOW            32771
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE    201
-#define _APS_NEXT_CONTROL_VALUE        1000
-#define _APS_NEXT_SYMED_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE        32775
-#endif
-#endif
diff --git a/samples/Javascript/CrystalCraze/proj.win32/testjs.rc b/samples/Javascript/CrystalCraze/proj.win32/testjs.rc
deleted file mode 100644
index 99e7360397..0000000000
--- a/samples/Javascript/CrystalCraze/proj.win32/testjs.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\testjs.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "testjs Module\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "testjs\0"
-            VALUE "LegalCopyright", "Copyright \0"
-            VALUE "OriginalFilename", "testjs.exe\0"
-            VALUE "ProductName", "testjs Module\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 0x04B0
-    END
-END
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
diff --git a/samples/Javascript/MoonWarriors/Classes/AppDelegate.h b/samples/Javascript/MoonWarriors/Classes/AppDelegate.h
deleted file mode 100644
index df8f12f70f..0000000000
--- a/samples/Javascript/MoonWarriors/Classes/AppDelegate.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  GCTestAppDelegate.h
-//  GCTest
-//
-//  Created by Rohan Kuruvilla on 06/08/2012.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#ifndef  _APP_DELEGATE_H_
-#define  _APP_DELEGATE_H_
-
-#include "CCApplication.h"
-/**
- @brief    The cocos2d Application.
- 
- The reason for implement as private inheritance is to hide some interface call by Director.
- */
-class  AppDelegate : private cocos2d::Application
-{
-public:
-    AppDelegate();
-    virtual ~AppDelegate();
-    
-    /**
-     @brief    Implement Director and Scene init code here.
-     @return true    Initialize success, app continue.
-     @return false   Initialize failed, app terminate.
-     */
-    virtual bool applicationDidFinishLaunching();
-    
-    /**
-     @brief  The function be called when the application enter background
-     @param  the pointer of the application
-     */
-    virtual void applicationDidEnterBackground();
-    
-    /**
-     @brief  The function be called when the application enter foreground
-     @param  the pointer of the application
-     */
-    virtual void applicationWillEnterForeground();
-};
-
-#endif // _APP_DELEGATE_H_
-
diff --git a/samples/Javascript/MoonWarriors/proj.android/.classpath b/samples/Javascript/MoonWarriors/proj.android/.classpath
deleted file mode 100644
index 0b08408342..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/samples/Javascript/MoonWarriors/proj.android/.project b/samples/Javascript/MoonWarriors/proj.android/.project
deleted file mode 100644
index 4bdf70520e..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/.project
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>MoonWarriors</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Classes</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/samples/Javascript/MoonWarriors/Classes</locationURI>
-		</link>
-		<link>
-			<name>cocos2dx</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/cocos2dx</locationURI>
-		</link>
-		<link>
-			<name>cocosdenshion</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/CocosDenshion</locationURI>
-		</link>
-		<link>
-			<name>extensions</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/extensions</locationURI>
-		</link>
-		<link>
-			<name>scripting</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/scripting</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/samples/Javascript/MoonWarriors/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/MoonWarriors/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml b/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml
deleted file mode 100644
index 0ba17d3e4a..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.cocos2dx.moonwarriors"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-feature android:glEsVersion="0x00020000" />
-
-    <application android:label="@string/app_name"
-        android:icon="@drawable/icon">
-
-        <activity android:name=".Cocos2dxActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="portrait"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation">
-
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name="android.app.lib_name"
-                       android:value="moonwarriors" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <supports-screens android:anyDensity="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:xlargeScreens="true"/>
-</manifest> 
diff --git a/samples/Javascript/MoonWarriors/proj.android/README.md b/samples/Javascript/MoonWarriors/proj.android/README.md
deleted file mode 100644
index 312835611a..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-## Prerequisites:
-
-* Android NDK
-* Android SDK **OR** Eclipse ADT Bundle
-* Android AVD target installed
-
-## Building project
-
-There are two ways of building Android projects.
-
-1. Eclipse
-2. Command Line
-
-### Import Project in Eclipse
-
-#### Features:
-
-1. Complete workflow from Eclipse, including:
-	* Build C++.
-	* Clean C++.
-	* Build and Run whole project.
-	* Logcat view.
-	* Debug Java code.
-	* Javascript editor.
-	* Project management.
-2. True C++ editing, including:
-	* Code completion. 
-	* Jump to definition.
-	* Refactoring tools etc. 
-	* Quick open C++ files.
-
-
-#### Setup Eclipse Environment (only once)
-
-
-**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before.
-
-1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html)
-
-   **OR**
-
-   Install Eclipse with Java. Add ADT and CDT plugins.
-
-2. Only for Windows
-    1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install).
-    2. Add `Cygwin\bin` directory to system PATH variable.
-    3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file.
-   
-3. Set up Variables: 
-	1. Path Variable `COCOS2DX`: 
-		* Eclipse->Preferences->General->Workspace->**Linked Resources**
-		* Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory.
-		![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png)
-
-	2. C/C++ Environment Variable `NDK_ROOT`: 
-		* Eclipse->Preferences->C/C++->Build->**Environment**.
-		* Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory.
-		![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png)
-		* Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr`
-		
-4. Import libcocos2dx library project:
-	1. File->New->Project->Android Project From Existing Code.
-	2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory.
-	3. Click **Finish** to add project.
-	
-#### Adding and running from Eclipse
-
-![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png)
-
-1. File->New->Project->Android Project From Existing Code
-2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/`
-3. Add the project 
-4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator.
-
-
-### Running project from Command Line
-
-    $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/
-    $ export NDK_ROOT=/path/to/ndk
-    $ ./build_native.sh
-    $ ant debug install
-
-If the last command results in sdk.dir missing error then do: 
-
-    $ android list target
-    $ android update project -p . -t (id from step 6)
-    $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6)
diff --git a/samples/Javascript/MoonWarriors/proj.android/ant.properties b/samples/Javascript/MoonWarriors/proj.android/ant.properties
deleted file mode 100644
index f8af38bfb4..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/ant.properties
+++ /dev/null
@@ -1 +0,0 @@
-aapt.ignore.assets="!*.pvr.gz:!*.gz:!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
diff --git a/samples/Javascript/MoonWarriors/proj.android/build.xml b/samples/Javascript/MoonWarriors/proj.android/build.xml
deleted file mode 100644
index ae419c802d..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="MoonWarriors" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk b/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk
deleted file mode 100644
index 93726f5b70..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/jni/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := moonwarriors_shared
-
-LOCAL_MODULE_FILENAME := libmoonwarriors
-
-LOCAL_SRC_FILES := moonwarriors/main.cpp \
-                   ../../Classes/AppDelegate.cpp
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static
-
-LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,scripting/javascript/bindings)
-$(call import-module,scripting/javascript/bindings/chipmunk)
-$(call import-module,scripting/javascript/bindings/extension)
-$(call import-module,scripting/javascript/bindings/localstorage)
-$(call import-module,scripting/javascript/bindings/network)
-$(call import-module,scripting/javascript/bindings/cocosbuilder)
diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp b/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp
deleted file mode 100644
index 9793beefb1..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "AppDelegate.h"
-#include "cocos2d.h"
-#include "platform/android/jni/JniHelper.h"
-#include "CCEventType.h"
-#include <jni.h>
-#include <android/log.h>
-
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
-
-using namespace cocos2d;
-
-void cocos_android_app_init (struct android_app* app) {
-    LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
-}
diff --git a/samples/Javascript/MoonWarriors/proj.android/proguard-project.txt b/samples/Javascript/MoonWarriors/proj.android/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/samples/Javascript/MoonWarriors/proj.android/project.properties b/samples/Javascript/MoonWarriors/proj.android/project.properties
deleted file mode 100644
index 0a6dc6664d..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-10
-
-android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/MoonWarriors/proj.android/res/values/strings.xml b/samples/Javascript/MoonWarriors/proj.android/res/values/strings.xml
deleted file mode 100644
index 707408a4d7..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">MoonWarriors</string>
-</resources>
diff --git a/samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/Cocos2dxActivity.java b/samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/Cocos2dxActivity.java
deleted file mode 100644
index c979c4d044..0000000000
--- a/samples/Javascript/MoonWarriors/proj.android/src/org/cocos2dx/moonwarriors/Cocos2dxActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.cocos2dx.moonwarriors;
-
-import android.app.NativeActivity;
-import android.graphics.PixelFormat;
-import android.os.Bundle;
-
-public class Cocos2dxActivity extends NativeActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		// TODO Auto-generated method stub
-		super.onCreate(savedInstanceState);
-		
-		//For supports translucency
-		
-		//1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp
-		/*const EGLint attribs[] = {
-	            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-	            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,  
-	            //EGL_BLUE_SIZE, 5,   -->delete 
-	            //EGL_GREEN_SIZE, 6,  -->delete 
-	            //EGL_RED_SIZE, 5,    -->delete 
-	            EGL_BUFFER_SIZE, 32,  //-->new field
-	            EGL_DEPTH_SIZE, 16,
-	            EGL_STENCIL_SIZE, 8,
-	            EGL_NONE
-	    };*/
-		
-		//2.Set the format of window
-		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
-		
-	}
-}
diff --git a/samples/Javascript/MoonWarriors/proj.ios/AppController.h b/samples/Javascript/MoonWarriors/proj.ios/AppController.h
deleted file mode 100644
index 10287bd13f..0000000000
--- a/samples/Javascript/MoonWarriors/proj.ios/AppController.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-@class RootViewController;
-
-@interface AppController : NSObject <UIAccelerometerDelegate, UIAlertViewDelegate, UITextFieldDelegate,UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
-}
-
-@end
-
diff --git a/samples/Javascript/MoonWarriors/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/MoonWarriors/proj.ios/Default-568h@2x.png.REMOVED.git-id
deleted file mode 100644
index 8f5838f3a8..0000000000
--- a/samples/Javascript/MoonWarriors/proj.ios/Default-568h@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-66c6d1cead373b45218424f6a82f370897e443e4
\ No newline at end of file
diff --git a/samples/Javascript/MoonWarriors/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/MoonWarriors/proj.ios/Default@2x.png.REMOVED.git-id
deleted file mode 100644
index 8843505b20..0000000000
--- a/samples/Javascript/MoonWarriors/proj.ios/Default@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-84689888a14a2123d2b39f7f2f61be8c15207479
\ No newline at end of file
diff --git a/samples/Javascript/MoonWarriors/proj.ios/Prefix.pch b/samples/Javascript/MoonWarriors/proj.ios/Prefix.pch
deleted file mode 100644
index b056d8694a..0000000000
--- a/samples/Javascript/MoonWarriors/proj.ios/Prefix.pch
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'testjs' target in the 'testjs' project
-//
-
-#ifdef __OBJC__
-	#import <Foundation/Foundation.h>
-	#import <UIKit/UIKit.h>
-#endif
diff --git a/samples/Javascript/MoonWarriors/proj.ios/RootViewController.h b/samples/Javascript/MoonWarriors/proj.ios/RootViewController.h
deleted file mode 100644
index 11dfc4bf88..0000000000
--- a/samples/Javascript/MoonWarriors/proj.ios/RootViewController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-
-@interface RootViewController : UIViewController {
-
-}
-- (BOOL)prefersStatusBarHidden;
-@end
diff --git a/samples/Javascript/MoonWarriors/proj.ios/RootViewController.mm b/samples/Javascript/MoonWarriors/proj.ios/RootViewController.mm
deleted file mode 100644
index 3a37088ebd..0000000000
--- a/samples/Javascript/MoonWarriors/proj.ios/RootViewController.mm
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import "RootViewController.h"
-
-
-@implementation RootViewController
-
-/*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-/*
-// Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
-}
-*/
-
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
- 
-*/
-// Override to allow orientations other than the default portrait orientation.
-// This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsPortrait(interfaceOrientation);
-}
-
-// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
-#ifdef __IPHONE_6_0
-    return UIInterfaceOrientationMaskAllButUpsideDown;
-#endif
-}
-
-- (BOOL) shouldAutorotate {
-    return YES;
-}
-
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end
diff --git a/samples/Javascript/MoonWarriors/proj.ios/main.m b/samples/Javascript/MoonWarriors/proj.ios/main.m
deleted file mode 100644
index e3dedca28b..0000000000
--- a/samples/Javascript/MoonWarriors/proj.ios/main.m
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  main.m
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppController");
-    [pool release];
-    return retVal;
-}
diff --git a/samples/Javascript/MoonWarriors/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/MoonWarriors/proj.mac/Icon.icns.REMOVED.git-id
deleted file mode 100644
index 9874ec6979..0000000000
--- a/samples/Javascript/MoonWarriors/proj.mac/Icon.icns.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0
\ No newline at end of file
diff --git a/samples/Javascript/MoonWarriors/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/MoonWarriors/proj.mac/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/samples/Javascript/MoonWarriors/proj.mac/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/samples/Javascript/MoonWarriors/proj.mac/en.lproj/MainMenu.xib b/samples/Javascript/MoonWarriors/proj.mac/en.lproj/MainMenu.xib
deleted file mode 100644
index 3dacdedbd0..0000000000
--- a/samples/Javascript/MoonWarriors/proj.mac/en.lproj/MainMenu.xib
+++ /dev/null
@@ -1,812 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSMenuItem</string>
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">TestCpp</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">TestCpp</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About TestCpp</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="609285721">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Preferences…</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="481834944">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-										</object>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide TestCpp</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit TestCpp</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="204933491">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Toggle Fullscreen</string>
-									<string key="NSKeyEquiv">f</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="448692316">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="992780483">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="105068016">
-									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">TestCpp Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">495</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="105068016"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFullScreen:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="204933491"/>
-					</object>
-					<int key="connectionID">537</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713487014"/>
-							<reference ref="694149608"/>
-							<reference ref="586577488"/>
-							<reference ref="448692316"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="835318025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110575045"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="609285721"/>
-							<reference ref="481834944"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-						</object>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="609285721"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="481834944"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752062318"/>
-						</object>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="299356726"/>
-							<reference ref="625202149"/>
-							<reference ref="575023229"/>
-							<reference ref="1011231497"/>
-						</object>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="466310130"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="204933491"/>
-						</object>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="448692316"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="992780483"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="992780483"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="105068016"/>
-						</object>
-						<reference key="parent" ref="448692316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="105068016"/>
-						<reference key="parent" ref="992780483"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">536</int>
-						<reference key="object" ref="204933491"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>129.IBPluginDependency</string>
-					<string>130.IBPluginDependency</string>
-					<string>131.IBPluginDependency</string>
-					<string>134.IBPluginDependency</string>
-					<string>136.IBPluginDependency</string>
-					<string>143.IBPluginDependency</string>
-					<string>144.IBPluginDependency</string>
-					<string>145.IBPluginDependency</string>
-					<string>149.IBPluginDependency</string>
-					<string>150.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>23.IBPluginDependency</string>
-					<string>236.IBPluginDependency</string>
-					<string>239.IBPluginDependency</string>
-					<string>24.IBPluginDependency</string>
-					<string>29.IBPluginDependency</string>
-					<string>295.IBPluginDependency</string>
-					<string>296.IBPluginDependency</string>
-					<string>420.IBPluginDependency</string>
-					<string>490.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>492.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>536.IBPluginDependency</string>
-					<string>56.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>92.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">541</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">exitFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>EAGLView</string>
-							<string>NSWindow</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">glView</string>
-								<string key="candidateClassName">EAGLView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">window</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">EAGLView</string>
-					<string key="superclassName">NSOpenGLView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/EAGLView.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-			</object>
-		</object>
-	</data>
-</archive>
diff --git a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj b/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
deleted file mode 100644
index d0dfa15e88..0000000000
--- a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1DB7C0FC-46FF-4A1B-82E0-C6244EEEC4C2}</ProjectGuid>
-    <RootNamespace>MoonWarriors</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\MoonWarriorsRes" rd /s /q "$(OutDir)\MoonWarriorsRes"
-mkdir "$(OutDir)\MoonWarriorsRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\MoonWarriorsRes" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\games\MoonWarriors" "$(OutDir)\MoonWarriorsRes\" /e /Y</Command>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>.;..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\MoonWarriorsRes" rd /s /q "$(OutDir)\MoonWarriorsRes"
-mkdir "$(OutDir)\MoonWarriorsRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\MoonWarriorsRes" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\games\MoonWarriors" "$(OutDir)\MoonWarriorsRes\" /e /Y</Command>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="..\Classes\AppDelegate.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="main.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="..\Classes\AppDelegate.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\testjs.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testjs.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
-      <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
-      <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
-      <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
-      <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
-      <Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\chipmunk\libJSBindingForChipmunk.vcxproj">
-      <Project>{21070e58-eec6-4e16-8b4f-6d083df55790}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj">
-      <Project>{f9da0fc1-651b-457b-962e-a4d61cebf5fd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\extension\libJSBindingForExtension.vcxproj">
-      <Project>{625f7391-9a91-48a1-8cfc-79508c822637}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\localstorage\libJSBindingForLocalStorage.vcxproj">
-      <Project>{68f5f371-bd7b-4c30-ae5b-0b08f22e0cde}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj">
-      <Project>{39379840-825a-45a0-b363-c09ffef864bd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
-      <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
-      <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
-      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.filters b/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.filters
deleted file mode 100644
index 56df37ce6f..0000000000
--- a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.filters
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="resource">
-      <UniqueIdentifier>{ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest</Extensions>
-    </Filter>
-    <Filter Include="win32">
-      <UniqueIdentifier>{ccb2323b-1cfa-41ea-bcf4-ba5f07309396}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Classes">
-      <UniqueIdentifier>{e93a77e1-af1e-4400-87d3-504b62ebdbb0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\AppDelegate.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="main.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\AppDelegate.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\testjs.ico">
-      <Filter>resource</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testjs.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.user b/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.user
deleted file mode 100644
index 475efbea21..0000000000
--- a/samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\MoonWarriorsRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\MoonWarriorsRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/MoonWarriors/proj.win32/main.cpp b/samples/Javascript/MoonWarriors/proj.win32/main.cpp
deleted file mode 100644
index 42d84925be..0000000000
--- a/samples/Javascript/MoonWarriors/proj.win32/main.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "main.h"
-#include "AppDelegate.h"
-#include "CCEGLView.h"
-
-USING_NS_CC;
-
-// uncomment below line, open debug console
-// #define USE_WIN32_CONSOLE
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-
-#ifdef USE_WIN32_CONSOLE
-    AllocConsole();
-    freopen("CONIN$", "r", stdin);
-    freopen("CONOUT$", "w", stdout);
-    freopen("CONOUT$", "w", stderr);
-#endif
-
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("MoonWarriors", 480, 720);
-
-    int ret = Application::getInstance()->run();
-
-#ifdef USE_WIN32_CONSOLE
-    FreeConsole();
-#endif
-
-    return ret;
-}
diff --git a/samples/Javascript/MoonWarriors/proj.win32/main.h b/samples/Javascript/MoonWarriors/proj.win32/main.h
deleted file mode 100644
index e29aeedb3a..0000000000
--- a/samples/Javascript/MoonWarriors/proj.win32/main.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-
-// Windows Header Files:
-#include <tchar.h>
-
-// C RunTime Header Files
-#include "CCStdC.h"
-
-#endif    // __WINMAIN_H__
diff --git a/samples/Javascript/MoonWarriors/proj.win32/res/testjs.ico b/samples/Javascript/MoonWarriors/proj.win32/res/testjs.ico
deleted file mode 100644
index feaf932a74..0000000000
Binary files a/samples/Javascript/MoonWarriors/proj.win32/res/testjs.ico and /dev/null differ
diff --git a/samples/Javascript/MoonWarriors/proj.win32/resource.h b/samples/Javascript/MoonWarriors/proj.win32/resource.h
deleted file mode 100644
index a4cfa38af8..0000000000
--- a/samples/Javascript/MoonWarriors/proj.win32/resource.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by testjs.RC
-//
-
-#define IDS_PROJNAME                100
-#define IDR_TESTJS    100
-
-#define ID_FILE_NEW_WINDOW            32771
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE    201
-#define _APS_NEXT_CONTROL_VALUE        1000
-#define _APS_NEXT_SYMED_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE        32775
-#endif
-#endif
diff --git a/samples/Javascript/MoonWarriors/proj.win32/testjs.rc b/samples/Javascript/MoonWarriors/proj.win32/testjs.rc
deleted file mode 100644
index 99e7360397..0000000000
--- a/samples/Javascript/MoonWarriors/proj.win32/testjs.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\testjs.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "testjs Module\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "testjs\0"
-            VALUE "LegalCopyright", "Copyright \0"
-            VALUE "OriginalFilename", "testjs.exe\0"
-            VALUE "ProductName", "testjs Module\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 0x04B0
-    END
-END
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
diff --git a/samples/Javascript/Shared b/samples/Javascript/Shared
deleted file mode 160000
index 67ef9b611f..0000000000
--- a/samples/Javascript/Shared
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 67ef9b611f26a3da00d907b0a36903a929730baa
diff --git a/samples/Javascript/TestJavascript/Classes/AppDelegate.h b/samples/Javascript/TestJavascript/Classes/AppDelegate.h
deleted file mode 100644
index df8f12f70f..0000000000
--- a/samples/Javascript/TestJavascript/Classes/AppDelegate.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  GCTestAppDelegate.h
-//  GCTest
-//
-//  Created by Rohan Kuruvilla on 06/08/2012.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#ifndef  _APP_DELEGATE_H_
-#define  _APP_DELEGATE_H_
-
-#include "CCApplication.h"
-/**
- @brief    The cocos2d Application.
- 
- The reason for implement as private inheritance is to hide some interface call by Director.
- */
-class  AppDelegate : private cocos2d::Application
-{
-public:
-    AppDelegate();
-    virtual ~AppDelegate();
-    
-    /**
-     @brief    Implement Director and Scene init code here.
-     @return true    Initialize success, app continue.
-     @return false   Initialize failed, app terminate.
-     */
-    virtual bool applicationDidFinishLaunching();
-    
-    /**
-     @brief  The function be called when the application enter background
-     @param  the pointer of the application
-     */
-    virtual void applicationDidEnterBackground();
-    
-    /**
-     @brief  The function be called when the application enter foreground
-     @param  the pointer of the application
-     */
-    virtual void applicationWillEnterForeground();
-};
-
-#endif // _APP_DELEGATE_H_
-
diff --git a/samples/Javascript/TestJavascript/proj.android/.classpath b/samples/Javascript/TestJavascript/proj.android/.classpath
deleted file mode 100644
index 0b08408342..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/samples/Javascript/TestJavascript/proj.android/.project b/samples/Javascript/TestJavascript/proj.android/.project
deleted file mode 100644
index 48030971da..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/.project
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>TestJavascript</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Classes</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/samples/Javascript/TestJavascript/Classes</locationURI>
-		</link>
-		<link>
-			<name>cocos2dx</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/cocos2dx</locationURI>
-		</link>
-		<link>
-			<name>cocosdenshion</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/CocosDenshion</locationURI>
-		</link>
-		<link>
-			<name>extensions</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/extensions</locationURI>
-		</link>
-		<link>
-			<name>scripting</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/scripting</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/.jsdtscope b/samples/Javascript/TestJavascript/proj.android/.settings/.jsdtscope
deleted file mode 100644
index bbf7a521cc..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/.settings/.jsdtscope
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="lib" path="/Users/rohankuruvilla/work/cc/scripting/javascript/bindings/generated/cocos2dxapi.js"/>
-	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
-	<classpathentry kind="output" path=""/>
-</classpath>
diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs b/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs
deleted file mode 100644
index 6bf5ec1a0a..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.wst.jsdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container b/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container
deleted file mode 100644
index 3bd5d0a480..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
diff --git a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name b/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name
deleted file mode 100644
index 05bd71b6ec..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ /dev/null
@@ -1 +0,0 @@
-Window
\ No newline at end of file
diff --git a/samples/Javascript/TestJavascript/proj.android/README.md b/samples/Javascript/TestJavascript/proj.android/README.md
deleted file mode 100644
index 312835611a..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-## Prerequisites:
-
-* Android NDK
-* Android SDK **OR** Eclipse ADT Bundle
-* Android AVD target installed
-
-## Building project
-
-There are two ways of building Android projects.
-
-1. Eclipse
-2. Command Line
-
-### Import Project in Eclipse
-
-#### Features:
-
-1. Complete workflow from Eclipse, including:
-	* Build C++.
-	* Clean C++.
-	* Build and Run whole project.
-	* Logcat view.
-	* Debug Java code.
-	* Javascript editor.
-	* Project management.
-2. True C++ editing, including:
-	* Code completion. 
-	* Jump to definition.
-	* Refactoring tools etc. 
-	* Quick open C++ files.
-
-
-#### Setup Eclipse Environment (only once)
-
-
-**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before.
-
-1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html)
-
-   **OR**
-
-   Install Eclipse with Java. Add ADT and CDT plugins.
-
-2. Only for Windows
-    1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install).
-    2. Add `Cygwin\bin` directory to system PATH variable.
-    3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file.
-   
-3. Set up Variables: 
-	1. Path Variable `COCOS2DX`: 
-		* Eclipse->Preferences->General->Workspace->**Linked Resources**
-		* Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory.
-		![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png)
-
-	2. C/C++ Environment Variable `NDK_ROOT`: 
-		* Eclipse->Preferences->C/C++->Build->**Environment**.
-		* Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory.
-		![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png)
-		* Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr`
-		
-4. Import libcocos2dx library project:
-	1. File->New->Project->Android Project From Existing Code.
-	2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory.
-	3. Click **Finish** to add project.
-	
-#### Adding and running from Eclipse
-
-![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png)
-
-1. File->New->Project->Android Project From Existing Code
-2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/`
-3. Add the project 
-4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator.
-
-
-### Running project from Command Line
-
-    $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/
-    $ export NDK_ROOT=/path/to/ndk
-    $ ./build_native.sh
-    $ ant debug install
-
-If the last command results in sdk.dir missing error then do: 
-
-    $ android list target
-    $ android update project -p . -t (id from step 6)
-    $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6)
diff --git a/samples/Javascript/TestJavascript/proj.android/ant.properties b/samples/Javascript/TestJavascript/proj.android/ant.properties
deleted file mode 100644
index f8af38bfb4..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/ant.properties
+++ /dev/null
@@ -1 +0,0 @@
-aapt.ignore.assets="!*.pvr.gz:!*.gz:!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
diff --git a/samples/Javascript/TestJavascript/proj.android/jni/Application.mk b/samples/Javascript/TestJavascript/proj.android/jni/Application.mk
deleted file mode 100644
index 47d8add103..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_STL := gnustl_static
-
-# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
-# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Javascript/TestJavascript/proj.android/jni/testjavascript/main.cpp b/samples/Javascript/TestJavascript/proj.android/jni/testjavascript/main.cpp
deleted file mode 100644
index 9793beefb1..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/jni/testjavascript/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "AppDelegate.h"
-#include "cocos2d.h"
-#include "platform/android/jni/JniHelper.h"
-#include "CCEventType.h"
-#include <jni.h>
-#include <android/log.h>
-
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
-
-using namespace cocos2d;
-
-void cocos_android_app_init (struct android_app* app) {
-    LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
-}
diff --git a/samples/Javascript/TestJavascript/proj.android/proguard-project.txt b/samples/Javascript/TestJavascript/proj.android/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/samples/Javascript/TestJavascript/proj.android/project.properties b/samples/Javascript/TestJavascript/proj.android/project.properties
deleted file mode 100644
index 0a6dc6664d..0000000000
--- a/samples/Javascript/TestJavascript/proj.android/project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-10
-
-android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/TestJavascript/proj.ios/AppController.h b/samples/Javascript/TestJavascript/proj.ios/AppController.h
deleted file mode 100644
index 10287bd13f..0000000000
--- a/samples/Javascript/TestJavascript/proj.ios/AppController.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-@class RootViewController;
-
-@interface AppController : NSObject <UIAccelerometerDelegate, UIAlertViewDelegate, UITextFieldDelegate,UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
-}
-
-@end
-
diff --git a/samples/Javascript/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id
deleted file mode 100644
index 8f5838f3a8..0000000000
--- a/samples/Javascript/TestJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-66c6d1cead373b45218424f6a82f370897e443e4
\ No newline at end of file
diff --git a/samples/Javascript/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id
deleted file mode 100644
index 8843505b20..0000000000
--- a/samples/Javascript/TestJavascript/proj.ios/Default@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-84689888a14a2123d2b39f7f2f61be8c15207479
\ No newline at end of file
diff --git a/samples/Javascript/TestJavascript/proj.ios/Prefix.pch b/samples/Javascript/TestJavascript/proj.ios/Prefix.pch
deleted file mode 100644
index b056d8694a..0000000000
--- a/samples/Javascript/TestJavascript/proj.ios/Prefix.pch
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'testjs' target in the 'testjs' project
-//
-
-#ifdef __OBJC__
-	#import <Foundation/Foundation.h>
-	#import <UIKit/UIKit.h>
-#endif
diff --git a/samples/Javascript/TestJavascript/proj.ios/RootViewController.h b/samples/Javascript/TestJavascript/proj.ios/RootViewController.h
deleted file mode 100644
index 11dfc4bf88..0000000000
--- a/samples/Javascript/TestJavascript/proj.ios/RootViewController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-
-@interface RootViewController : UIViewController {
-
-}
-- (BOOL)prefersStatusBarHidden;
-@end
diff --git a/samples/Javascript/TestJavascript/proj.ios/RootViewController.mm b/samples/Javascript/TestJavascript/proj.ios/RootViewController.mm
deleted file mode 100644
index 8438d7a420..0000000000
--- a/samples/Javascript/TestJavascript/proj.ios/RootViewController.mm
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import "RootViewController.h"
-
-
-@implementation RootViewController
-
-/*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-/*
-// Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
-}
-*/
-
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
- 
-*/
-// Override to allow orientations other than the default portrait orientation.
-// This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
-}
-
-// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
-#ifdef __IPHONE_6_0
-    return UIInterfaceOrientationMaskAllButUpsideDown;
-#endif
-}
-
-- (BOOL) shouldAutorotate {
-    return YES;
-}
-
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end
diff --git a/samples/Javascript/TestJavascript/proj.ios/main.m b/samples/Javascript/TestJavascript/proj.ios/main.m
deleted file mode 100644
index e3dedca28b..0000000000
--- a/samples/Javascript/TestJavascript/proj.ios/main.m
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  main.m
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppController");
-    [pool release];
-    return retVal;
-}
diff --git a/samples/Javascript/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id
deleted file mode 100644
index 9874ec6979..0000000000
--- a/samples/Javascript/TestJavascript/proj.mac/Icon.icns.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0
\ No newline at end of file
diff --git a/samples/Javascript/TestJavascript/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/TestJavascript/proj.mac/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/samples/Javascript/TestJavascript/proj.mac/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/samples/Javascript/TestJavascript/proj.mac/en.lproj/MainMenu.xib b/samples/Javascript/TestJavascript/proj.mac/en.lproj/MainMenu.xib
deleted file mode 100644
index 3dacdedbd0..0000000000
--- a/samples/Javascript/TestJavascript/proj.mac/en.lproj/MainMenu.xib
+++ /dev/null
@@ -1,812 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSMenuItem</string>
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">TestCpp</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">TestCpp</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About TestCpp</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="609285721">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Preferences…</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="481834944">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-										</object>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide TestCpp</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit TestCpp</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="204933491">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Toggle Fullscreen</string>
-									<string key="NSKeyEquiv">f</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="448692316">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="992780483">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="105068016">
-									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">TestCpp Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">495</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="105068016"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFullScreen:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="204933491"/>
-					</object>
-					<int key="connectionID">537</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713487014"/>
-							<reference ref="694149608"/>
-							<reference ref="586577488"/>
-							<reference ref="448692316"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="835318025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110575045"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="609285721"/>
-							<reference ref="481834944"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-						</object>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="609285721"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="481834944"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752062318"/>
-						</object>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="299356726"/>
-							<reference ref="625202149"/>
-							<reference ref="575023229"/>
-							<reference ref="1011231497"/>
-						</object>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="466310130"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="204933491"/>
-						</object>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="448692316"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="992780483"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="992780483"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="105068016"/>
-						</object>
-						<reference key="parent" ref="448692316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="105068016"/>
-						<reference key="parent" ref="992780483"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">536</int>
-						<reference key="object" ref="204933491"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>129.IBPluginDependency</string>
-					<string>130.IBPluginDependency</string>
-					<string>131.IBPluginDependency</string>
-					<string>134.IBPluginDependency</string>
-					<string>136.IBPluginDependency</string>
-					<string>143.IBPluginDependency</string>
-					<string>144.IBPluginDependency</string>
-					<string>145.IBPluginDependency</string>
-					<string>149.IBPluginDependency</string>
-					<string>150.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>23.IBPluginDependency</string>
-					<string>236.IBPluginDependency</string>
-					<string>239.IBPluginDependency</string>
-					<string>24.IBPluginDependency</string>
-					<string>29.IBPluginDependency</string>
-					<string>295.IBPluginDependency</string>
-					<string>296.IBPluginDependency</string>
-					<string>420.IBPluginDependency</string>
-					<string>490.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>492.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>536.IBPluginDependency</string>
-					<string>56.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>92.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">541</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">exitFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>EAGLView</string>
-							<string>NSWindow</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">glView</string>
-								<string key="candidateClassName">EAGLView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">window</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">EAGLView</string>
-					<string key="superclassName">NSOpenGLView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/EAGLView.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-			</object>
-		</object>
-	</data>
-</archive>
diff --git a/samples/Javascript/TestJavascript/proj.win32/main.h b/samples/Javascript/TestJavascript/proj.win32/main.h
deleted file mode 100644
index e29aeedb3a..0000000000
--- a/samples/Javascript/TestJavascript/proj.win32/main.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-
-// Windows Header Files:
-#include <tchar.h>
-
-// C RunTime Header Files
-#include "CCStdC.h"
-
-#endif    // __WINMAIN_H__
diff --git a/samples/Javascript/TestJavascript/proj.win32/res/testjs.ico b/samples/Javascript/TestJavascript/proj.win32/res/testjs.ico
deleted file mode 100644
index feaf932a74..0000000000
Binary files a/samples/Javascript/TestJavascript/proj.win32/res/testjs.ico and /dev/null differ
diff --git a/samples/Javascript/TestJavascript/proj.win32/resource.h b/samples/Javascript/TestJavascript/proj.win32/resource.h
deleted file mode 100644
index a4cfa38af8..0000000000
--- a/samples/Javascript/TestJavascript/proj.win32/resource.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by testjs.RC
-//
-
-#define IDS_PROJNAME                100
-#define IDR_TESTJS    100
-
-#define ID_FILE_NEW_WINDOW            32771
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE    201
-#define _APS_NEXT_CONTROL_VALUE        1000
-#define _APS_NEXT_SYMED_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE        32775
-#endif
-#endif
diff --git a/samples/Javascript/TestJavascript/proj.win32/testjs.rc b/samples/Javascript/TestJavascript/proj.win32/testjs.rc
deleted file mode 100644
index 99e7360397..0000000000
--- a/samples/Javascript/TestJavascript/proj.win32/testjs.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\testjs.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "testjs Module\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "testjs\0"
-            VALUE "LegalCopyright", "Copyright \0"
-            VALUE "OriginalFilename", "testjs.exe\0"
-            VALUE "ProductName", "testjs Module\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 0x04B0
-    END
-END
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
diff --git a/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.h b/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.h
deleted file mode 100644
index df8f12f70f..0000000000
--- a/samples/Javascript/WatermelonWithMe/Classes/AppDelegate.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-//  GCTestAppDelegate.h
-//  GCTest
-//
-//  Created by Rohan Kuruvilla on 06/08/2012.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#ifndef  _APP_DELEGATE_H_
-#define  _APP_DELEGATE_H_
-
-#include "CCApplication.h"
-/**
- @brief    The cocos2d Application.
- 
- The reason for implement as private inheritance is to hide some interface call by Director.
- */
-class  AppDelegate : private cocos2d::Application
-{
-public:
-    AppDelegate();
-    virtual ~AppDelegate();
-    
-    /**
-     @brief    Implement Director and Scene init code here.
-     @return true    Initialize success, app continue.
-     @return false   Initialize failed, app terminate.
-     */
-    virtual bool applicationDidFinishLaunching();
-    
-    /**
-     @brief  The function be called when the application enter background
-     @param  the pointer of the application
-     */
-    virtual void applicationDidEnterBackground();
-    
-    /**
-     @brief  The function be called when the application enter foreground
-     @param  the pointer of the application
-     */
-    virtual void applicationWillEnterForeground();
-};
-
-#endif // _APP_DELEGATE_H_
-
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/.classpath b/samples/Javascript/WatermelonWithMe/proj.android/.classpath
deleted file mode 100644
index 0b08408342..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/.project b/samples/Javascript/WatermelonWithMe/proj.android/.project
deleted file mode 100644
index 1a3080f5bb..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/.project
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>WatermelonWithMe</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-	<linkedResources>
-		<link>
-			<name>Classes</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/samples/Javascript/WatermelonWithMe/Classes</locationURI>
-		</link>
-		<link>
-			<name>cocos2dx</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/cocos2dx</locationURI>
-		</link>
-		<link>
-			<name>cocosdenshion</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/CocosDenshion</locationURI>
-		</link>
-		<link>
-			<name>extensions</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/extensions</locationURI>
-		</link>
-		<link>
-			<name>scripting</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/scripting</locationURI>
-		</link>
-	</linkedResources>
-</projectDescription>
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Javascript/WatermelonWithMe/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml b/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml
deleted file mode 100644
index 517c887410..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.cocos2dx.watermelonwithme"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-feature android:glEsVersion="0x00020000" />
-
-    <application android:label="@string/app_name"
-                 android:icon="@drawable/icon">
-
-        <activity android:name=".Cocos2dxActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="landscape"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation">
-
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name="android.app.lib_name"
-                       android:value="watermelonwithme" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <supports-screens android:anyDensity="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:xlargeScreens="true"/>
-</manifest> 
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/README.md b/samples/Javascript/WatermelonWithMe/proj.android/README.md
deleted file mode 100644
index 312835611a..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-## Prerequisites:
-
-* Android NDK
-* Android SDK **OR** Eclipse ADT Bundle
-* Android AVD target installed
-
-## Building project
-
-There are two ways of building Android projects.
-
-1. Eclipse
-2. Command Line
-
-### Import Project in Eclipse
-
-#### Features:
-
-1. Complete workflow from Eclipse, including:
-	* Build C++.
-	* Clean C++.
-	* Build and Run whole project.
-	* Logcat view.
-	* Debug Java code.
-	* Javascript editor.
-	* Project management.
-2. True C++ editing, including:
-	* Code completion. 
-	* Jump to definition.
-	* Refactoring tools etc. 
-	* Quick open C++ files.
-
-
-#### Setup Eclipse Environment (only once)
-
-
-**NOTE:** This step needs to be done only once to setup the Eclipse environment for cocos2d-x projects. Skip this section if you've done this before.
-
-1. Download Eclipse ADT bundle from [Google ADT homepage](http://developer.android.com/sdk/index.html)
-
-   **OR**
-
-   Install Eclipse with Java. Add ADT and CDT plugins.
-
-2. Only for Windows
-    1. Install [Cygwin](http://www.cygwin.com/) with make (select make package from the list during the install).
-    2. Add `Cygwin\bin` directory to system PATH variable.
-    3. Add this line `none /cygdrive cygdrive binary,noacl,posix=0,user 0 0` to `Cygwin\etc\fstab` file.
-   
-3. Set up Variables: 
-	1. Path Variable `COCOS2DX`: 
-		* Eclipse->Preferences->General->Workspace->**Linked Resources**
-		* Click **New** button to add a Path Variable `COCOS2DX` pointing to the root cocos2d-x directory.
-		![Example](https://lh5.googleusercontent.com/-oPpk9kg3e5w/UUOYlq8n7aI/AAAAAAAAsdQ/zLA4eghBH9U/s400/cocos2d-x-eclipse-vars.png)
-
-	2. C/C++ Environment Variable `NDK_ROOT`: 
-		* Eclipse->Preferences->C/C++->Build->**Environment**.
-		* Click **Add** button and add a new variable `NDK_ROOT` pointing to the root NDK directory.
-		![Example](https://lh3.googleusercontent.com/-AVcY8IAT0_g/UUOYltoRobI/AAAAAAAAsdM/22D2J9u3sig/s400/cocos2d-x-eclipse-ndk.png)
-		* Only for Windows: Add new variables **CYGWIN** with value `nodosfilewarning` and **SHELLOPTS** with value `igncr`
-		
-4. Import libcocos2dx library project:
-	1. File->New->Project->Android Project From Existing Code.
-	2. Click **Browse** button and open `cocos2d-x/cocos2dx/platform/android/java` directory.
-	3. Click **Finish** to add project.
-	
-#### Adding and running from Eclipse
-
-![Example](https://lh3.googleusercontent.com/-SLBOu6e3QbE/UUOcOXYaGqI/AAAAAAAAsdo/tYBY2SylOSM/s288/cocos2d-x-eclipse-project-from-code.png) ![Import](https://lh5.googleusercontent.com/-XzC9Pn65USc/UUOcOTAwizI/AAAAAAAAsdk/4b6YM-oim9Y/s400/cocos2d-x-eclipse-import-project.png)
-
-1. File->New->Project->Android Project From Existing Code
-2. **Browse** to your project directory. eg: `cocos2d-x/cocos2dx/samples/Cpp/TestCpp/proj.android/`
-3. Add the project 
-4. Click **Run** or **Debug** to compile C++ followed by Java and to run on connected device or emulator.
-
-
-### Running project from Command Line
-
-    $ cd cocos2d-x/samples/Cpp/TestCpp/proj.android/
-    $ export NDK_ROOT=/path/to/ndk
-    $ ./build_native.sh
-    $ ant debug install
-
-If the last command results in sdk.dir missing error then do: 
-
-    $ android list target
-    $ android update project -p . -t (id from step 6)
-    $ android update project -p cocos2d-x/cocos2dx/platform/android/java/ -t (id from step 6)
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/ant.properties b/samples/Javascript/WatermelonWithMe/proj.android/ant.properties
deleted file mode 100644
index f8af38bfb4..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/ant.properties
+++ /dev/null
@@ -1 +0,0 @@
-aapt.ignore.assets="!*.pvr.gz:!*.gz:!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/build.xml b/samples/Javascript/WatermelonWithMe/proj.android/build.xml
deleted file mode 100644
index f3fd9b9293..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="TestJavascript" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk b/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk
deleted file mode 100644
index 2d7b4097ab..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/jni/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := watermelonwithme_shared
-
-LOCAL_MODULE_FILENAME := libwatermelonwithme
-
-LOCAL_SRC_FILES := watermelonwithme/main.cpp \
-                   ../../Classes/AppDelegate.cpp
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos_jsb_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_chipmunk_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_extension_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_localstorage_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_network_static
-LOCAL_WHOLE_STATIC_LIBRARIES += jsb_builder_static
-
-LOCAL_EXPORT_CFLAGS := -DCOCOS2D_DEBUG=2 -DCOCOS2D_JAVASCRIPT
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,scripting/javascript/bindings)
-$(call import-module,scripting/javascript/bindings/chipmunk)
-$(call import-module,scripting/javascript/bindings/extension)
-$(call import-module,scripting/javascript/bindings/localstorage)
-$(call import-module,scripting/javascript/bindings/network)
-$(call import-module,scripting/javascript/bindings/cocosbuilder)
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk b/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk
deleted file mode 100644
index 47d8add103..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/jni/Application.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_STL := gnustl_static
-
-# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
-# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp b/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp
deleted file mode 100644
index 9793beefb1..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "AppDelegate.h"
-#include "cocos2d.h"
-#include "platform/android/jni/JniHelper.h"
-#include "CCEventType.h"
-#include <jni.h>
-#include <android/log.h>
-
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
-
-using namespace cocos2d;
-
-void cocos_android_app_init (struct android_app* app) {
-    LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
-}
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/ndkgdb.sh b/samples/Javascript/WatermelonWithMe/proj.android/ndkgdb.sh
deleted file mode 100644
index 5df7332ceb..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/ndkgdb.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-APPNAME="TestJavascript"
-APP_ANDROID_NAME="org.cocos2dx.testjavascript"
-
-if [ -z "${SDK_ROOT+aaa}" ]; then
-# ... if SDK_ROOT is not set, use "$HOME/bin/android-sdk"
-    SDK_ROOT="$HOME/bin/android-sdk"
-fi
-
-if [ -z "${NDK_ROOT+aaa}" ]; then
-# ... if NDK_ROOT is not set, use "$HOME/bin/android-ndk"
-    NDK_ROOT="$HOME/bin/android-ndk"
-fi
-
-if [ -z "${COCOS2DX_ROOT+aaa}" ]; then
-# ... if COCOS2DX_ROOT is not set
-# ... find current working directory
-    DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# ... use paths relative to current directory
-    COCOS2DX_ROOT="$DIR/../../.."
-    APP_ROOT="$DIR/.."
-    APP_ANDROID_ROOT="$DIR"
-else
-    APP_ROOT="$COCOS2DX_ROOT/samples/$APPNAME"
-    APP_ANDROID_ROOT="$COCOS2DX_ROOT/samples/$APPNAME/proj.android"
-fi
-
-echo "NDK_ROOT = $NDK_ROOT"
-echo "SDK_ROOT = $SDK_ROOT"
-echo "COCOS2DX_ROOT = $COCOS2DX_ROOT"
-echo "APP_ROOT = $APP_ROOT"
-echo "APP_ANDROID_ROOT = $APP_ANDROID_ROOT"
-echo "APP_ANDROID_NAME = $APP_ANDROID_NAME"
-
-echo
-echo "Killing and restarting ${APP_ANDROID_NAME}"
-echo
-
-set -x
-
-"${SDK_ROOT}"/platform-tools/adb shell am force-stop "${APP_ANDROID_NAME}"
-
-NDK_MODULE_PATH="${COCOS2DX_ROOT}":"${COCOS2DX_ROOT}"/cocos2dx/platform/third_party/android/prebuilt \
-    "${NDK_ROOT}"/ndk-gdb \
-    --adb="${SDK_ROOT}"/platform-tools/adb \
-    --verbose \
-    --start \
-    --force
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/proguard-project.txt b/samples/Javascript/WatermelonWithMe/proj.android/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/project.properties b/samples/Javascript/WatermelonWithMe/proj.android/project.properties
deleted file mode 100644
index 0a6dc6664d..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-10
-
-android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/res/values/strings.xml b/samples/Javascript/WatermelonWithMe/proj.android/res/values/strings.xml
deleted file mode 100644
index 89aa34dcac..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">WatermelonWithMe</string>
-</resources>
diff --git a/samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/Cocos2dxActivity.java b/samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/Cocos2dxActivity.java
deleted file mode 100644
index 3fd0f293cf..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.android/src/org/cocos2dx/watermelonwithme/Cocos2dxActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.cocos2dx.watermelonwithme;
-
-import android.app.NativeActivity;
-import android.graphics.PixelFormat;
-import android.os.Bundle;
-
-public class Cocos2dxActivity extends NativeActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		// TODO Auto-generated method stub
-		super.onCreate(savedInstanceState);
-		
-		//For supports translucency
-		
-		//1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp
-		/*const EGLint attribs[] = {
-	            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-	            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,  
-	            //EGL_BLUE_SIZE, 5,   -->delete 
-	            //EGL_GREEN_SIZE, 6,  -->delete 
-	            //EGL_RED_SIZE, 5,    -->delete 
-	            EGL_BUFFER_SIZE, 32,  //-->new field
-	            EGL_DEPTH_SIZE, 16,
-	            EGL_STENCIL_SIZE, 8,
-	            EGL_NONE
-	    };*/
-		
-		//2.Set the format of window
-		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
-		
-	}
-}
diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/AppController.h b/samples/Javascript/WatermelonWithMe/proj.ios/AppController.h
deleted file mode 100644
index 10287bd13f..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.ios/AppController.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-@class RootViewController;
-
-@interface AppController : NSObject <UIAccelerometerDelegate, UIAlertViewDelegate, UITextFieldDelegate,UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
-}
-
-@end
-
diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Javascript/WatermelonWithMe/proj.ios/Default-568h@2x.png.REMOVED.git-id
deleted file mode 100644
index 8f5838f3a8..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.ios/Default-568h@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-66c6d1cead373b45218424f6a82f370897e443e4
\ No newline at end of file
diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Javascript/WatermelonWithMe/proj.ios/Default@2x.png.REMOVED.git-id
deleted file mode 100644
index 8843505b20..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.ios/Default@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-84689888a14a2123d2b39f7f2f61be8c15207479
\ No newline at end of file
diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/Prefix.pch b/samples/Javascript/WatermelonWithMe/proj.ios/Prefix.pch
deleted file mode 100644
index b056d8694a..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.ios/Prefix.pch
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'testjs' target in the 'testjs' project
-//
-
-#ifdef __OBJC__
-	#import <Foundation/Foundation.h>
-	#import <UIKit/UIKit.h>
-#endif
diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.h b/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.h
deleted file mode 100644
index 11dfc4bf88..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-
-@interface RootViewController : UIViewController {
-
-}
-- (BOOL)prefersStatusBarHidden;
-@end
diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.mm b/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.mm
deleted file mode 100644
index 8438d7a420..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.ios/RootViewController.mm
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-//  testjsAppController.h
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import "RootViewController.h"
-
-
-@implementation RootViewController
-
-/*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-/*
-// Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
-}
-*/
-
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
- 
-*/
-// Override to allow orientations other than the default portrait orientation.
-// This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
-}
-
-// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
-#ifdef __IPHONE_6_0
-    return UIInterfaceOrientationMaskAllButUpsideDown;
-#endif
-}
-
-- (BOOL) shouldAutorotate {
-    return YES;
-}
-
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end
diff --git a/samples/Javascript/WatermelonWithMe/proj.ios/main.m b/samples/Javascript/WatermelonWithMe/proj.ios/main.m
deleted file mode 100644
index e3dedca28b..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.ios/main.m
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  main.m
-//  testjs
-//
-//  Created by Rolando Abarca on 3/19/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppController");
-    [pool release];
-    return retVal;
-}
diff --git a/samples/Javascript/WatermelonWithMe/proj.mac/Icon.icns.REMOVED.git-id b/samples/Javascript/WatermelonWithMe/proj.mac/Icon.icns.REMOVED.git-id
deleted file mode 100644
index 9874ec6979..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.mac/Icon.icns.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0
\ No newline at end of file
diff --git a/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/InfoPlist.strings b/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/MainMenu.xib b/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/MainMenu.xib
deleted file mode 100644
index 3dacdedbd0..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.mac/en.lproj/MainMenu.xib
+++ /dev/null
@@ -1,812 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSMenuItem</string>
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">TestCpp</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">TestCpp</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About TestCpp</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="609285721">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Preferences…</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="481834944">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-										</object>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide TestCpp</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit TestCpp</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="204933491">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Toggle Fullscreen</string>
-									<string key="NSKeyEquiv">f</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="448692316">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="992780483">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="105068016">
-									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">TestCpp Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">495</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="105068016"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFullScreen:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="204933491"/>
-					</object>
-					<int key="connectionID">537</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713487014"/>
-							<reference ref="694149608"/>
-							<reference ref="586577488"/>
-							<reference ref="448692316"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="835318025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110575045"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="609285721"/>
-							<reference ref="481834944"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-						</object>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="609285721"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="481834944"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752062318"/>
-						</object>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="299356726"/>
-							<reference ref="625202149"/>
-							<reference ref="575023229"/>
-							<reference ref="1011231497"/>
-						</object>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="466310130"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="204933491"/>
-						</object>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="448692316"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="992780483"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="992780483"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="105068016"/>
-						</object>
-						<reference key="parent" ref="448692316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="105068016"/>
-						<reference key="parent" ref="992780483"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">536</int>
-						<reference key="object" ref="204933491"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>129.IBPluginDependency</string>
-					<string>130.IBPluginDependency</string>
-					<string>131.IBPluginDependency</string>
-					<string>134.IBPluginDependency</string>
-					<string>136.IBPluginDependency</string>
-					<string>143.IBPluginDependency</string>
-					<string>144.IBPluginDependency</string>
-					<string>145.IBPluginDependency</string>
-					<string>149.IBPluginDependency</string>
-					<string>150.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>23.IBPluginDependency</string>
-					<string>236.IBPluginDependency</string>
-					<string>239.IBPluginDependency</string>
-					<string>24.IBPluginDependency</string>
-					<string>29.IBPluginDependency</string>
-					<string>295.IBPluginDependency</string>
-					<string>296.IBPluginDependency</string>
-					<string>420.IBPluginDependency</string>
-					<string>490.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>492.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>536.IBPluginDependency</string>
-					<string>56.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>92.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">541</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">exitFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>EAGLView</string>
-							<string>NSWindow</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">glView</string>
-								<string key="candidateClassName">EAGLView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">window</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">EAGLView</string>
-					<string key="superclassName">NSOpenGLView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/EAGLView.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-			</object>
-		</object>
-	</data>
-</archive>
diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj b/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
deleted file mode 100644
index 0f76fa0e57..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{BE092D9E-95AE-4F86-84CE-F4519E4F3F15}</ProjectGuid>
-    <RootNamespace>WatermelonWithMe</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\WatermelonWithMeRes" rd /s /q "$(OutDir)\WatermelonWithMeRes"
-mkdir "$(OutDir)\WatermelonWithMeRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\WatermelonWithMeRes" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\games\WatermelonWithMe" "$(OutDir)\WatermelonWithMeRes\" /e /Y</Command>
-    </PreBuildEvent>
-    <PreBuildEvent>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)testjs.tlb</TypeLibraryName>
-      <HeaderFileName>testjs.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>testjs_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>testjs_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot);$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\scripting\auto-generated\js-bindings;$(EngineRoot)cocos\scripting\javascript\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\spidermonkey\include\win32;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;mozjs-25.0.lib;ws2_32.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreBuildEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-if exist "$(OutDir)\WatermelonWithMeRes" rd /s /q "$(OutDir)\WatermelonWithMeRes"
-mkdir "$(OutDir)\WatermelonWithMeRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\WatermelonWithMeRes" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\games\WatermelonWithMe" "$(OutDir)\WatermelonWithMeRes\" /e /Y</Command>
-      <Message>Copy js and resource files.</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="..\Classes\AppDelegate.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="main.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="..\Classes\AppDelegate.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\testjs.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testjs.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
-      <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
-      <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
-      <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
-      <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
-      <Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\chipmunk\libJSBindingForChipmunk.vcxproj">
-      <Project>{21070e58-eec6-4e16-8b4f-6d083df55790}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj">
-      <Project>{f9da0fc1-651b-457b-962e-a4d61cebf5fd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\extension\libJSBindingForExtension.vcxproj">
-      <Project>{625f7391-9a91-48a1-8cfc-79508c822637}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\localstorage\libJSBindingForLocalStorage.vcxproj">
-      <Project>{68f5f371-bd7b-4c30-ae5b-0b08f22e0cde}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj">
-      <Project>{39379840-825a-45a0-b363-c09ffef864bd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
-      <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
-      <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
-      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.filters b/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.filters
deleted file mode 100644
index 56df37ce6f..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.filters
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="resource">
-      <UniqueIdentifier>{ca9c9e15-d942-43a1-aa7a-5f0b74ca1afd}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;png;manifest</Extensions>
-    </Filter>
-    <Filter Include="win32">
-      <UniqueIdentifier>{ccb2323b-1cfa-41ea-bcf4-ba5f07309396}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Classes">
-      <UniqueIdentifier>{e93a77e1-af1e-4400-87d3-504b62ebdbb0}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Classes\AppDelegate.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="main.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Classes\AppDelegate.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\testjs.ico">
-      <Filter>resource</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="testjs.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.user b/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.user
deleted file mode 100644
index 93f348ba68..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\WatermelonWithMeRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(OutDir)\WatermelonWithMeRes</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/main.cpp b/samples/Javascript/WatermelonWithMe/proj.win32/main.cpp
deleted file mode 100644
index 3c69549eac..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.win32/main.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "main.h"
-#include "AppDelegate.h"
-#include "CCEGLView.h"
-
-USING_NS_CC;
-
-// uncomment below line, open debug console
-// #define USE_WIN32_CONSOLE
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-
-#ifdef USE_WIN32_CONSOLE
-    AllocConsole();
-    freopen("CONIN$", "r", stdin);
-    freopen("CONOUT$", "w", stdout);
-    freopen("CONOUT$", "w", stderr);
-#endif
-
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("WatermelonWithMe",900,640);
-
-    int ret = Application::getInstance()->run();
-
-#ifdef USE_WIN32_CONSOLE
-    FreeConsole();
-#endif
-
-    return ret;
-}
diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/main.h b/samples/Javascript/WatermelonWithMe/proj.win32/main.h
deleted file mode 100644
index e29aeedb3a..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.win32/main.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-
-// Windows Header Files:
-#include <tchar.h>
-
-// C RunTime Header Files
-#include "CCStdC.h"
-
-#endif    // __WINMAIN_H__
diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/res/testjs.ico b/samples/Javascript/WatermelonWithMe/proj.win32/res/testjs.ico
deleted file mode 100644
index feaf932a74..0000000000
Binary files a/samples/Javascript/WatermelonWithMe/proj.win32/res/testjs.ico and /dev/null differ
diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/resource.h b/samples/Javascript/WatermelonWithMe/proj.win32/resource.h
deleted file mode 100644
index a4cfa38af8..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.win32/resource.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by testjs.RC
-//
-
-#define IDS_PROJNAME                100
-#define IDR_TESTJS    100
-
-#define ID_FILE_NEW_WINDOW            32771
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE    201
-#define _APS_NEXT_CONTROL_VALUE        1000
-#define _APS_NEXT_SYMED_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE        32775
-#endif
-#endif
diff --git a/samples/Javascript/WatermelonWithMe/proj.win32/testjs.rc b/samples/Javascript/WatermelonWithMe/proj.win32/testjs.rc
deleted file mode 100644
index 99e7360397..0000000000
--- a/samples/Javascript/WatermelonWithMe/proj.win32/testjs.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON                    "res\\testjs.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "testjs Module\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "testjs\0"
-            VALUE "LegalCopyright", "Copyright \0"
-            VALUE "OriginalFilename", "testjs.exe\0"
-            VALUE "ProductName", "testjs Module\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0409, 0x04B0
-    END
-END
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
diff --git a/samples/Lua/HelloLua/CMakeLists.txt b/samples/Lua/HelloLua/CMakeLists.txt
deleted file mode 100644
index 894fc66565..0000000000
--- a/samples/Lua/HelloLua/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-set(APP_NAME hellolua)
-
-set(SAMPLE_SRC
-  proj.linux/main.cpp
-  Classes/AppDelegate.cpp
-)
-
-include_directories(
-  Classes
-  ../../../cocos/scripting/lua/bindings
-  ../../../external/lua/lua
-  ../../../external/lua/tolua
-)
-
-# add the executable
-add_executable(${APP_NAME}
-  ${SAMPLE_SRC}
-)
-
-target_link_libraries(${APP_NAME}
-  luabinding
-  gui
-  network
-  cocostudio
-  cocosbuilder
-  extensions
-  audio
-  cocos2d
-)
-
-set(APP_BIN_DIR "${CMAKE_BINARY_DIR}/bin/${APP_NAME}")
-
-set_target_properties(${APP_NAME} PROPERTIES
-     RUNTIME_OUTPUT_DIRECTORY  "${APP_BIN_DIR}")
-
-pre_build(${APP_NAME}
-  COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua/script ${APP_BIN_DIR}/Resources
-  )
diff --git a/samples/Lua/HelloLua/Classes/AppDelegate.h b/samples/Lua/HelloLua/Classes/AppDelegate.h
deleted file mode 100644
index b708f4bdca..0000000000
--- a/samples/Lua/HelloLua/Classes/AppDelegate.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef  _APP_DELEGATE_H_
-#define  _APP_DELEGATE_H_
-
-#include "CCApplication.h"
-
-/**
-@brief    The cocos2d Application.
-
-The reason for implement as private inheritance is to hide some interface call by Director.
-*/
-class  AppDelegate : private cocos2d::Application
-{
-public:
-    AppDelegate();
-    virtual ~AppDelegate();
-
-    /**
-    @brief    Implement Director and Scene init code here.
-    @return true    Initialize success, app continue.
-    @return false   Initialize failed, app terminate.
-    */
-    virtual bool applicationDidFinishLaunching();
-
-    /**
-    @brief  The function be called when the application enter background
-    @param  the pointer of the application
-    */
-    virtual void applicationDidEnterBackground();
-
-    /**
-    @brief  The function be called when the application enter foreground
-    @param  the pointer of the application
-    */
-    virtual void applicationWillEnterForeground();
-};
-
-#endif // _APP_DELEGATE_H_
-
diff --git a/samples/Lua/HelloLua/Resources/.gitignore b/samples/Lua/HelloLua/Resources/.gitignore
deleted file mode 100644
index 1d65afe366..0000000000
--- a/samples/Lua/HelloLua/Resources/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#Do now ignore  Marmalade icf files
-!*.icf
diff --git a/samples/Lua/HelloLua/Resources/Resources/.gitignore b/samples/Lua/HelloLua/Resources/Resources/.gitignore
deleted file mode 100644
index 1d65afe366..0000000000
--- a/samples/Lua/HelloLua/Resources/Resources/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#Do now ignore  Marmalade icf files
-!*.icf
diff --git a/samples/Lua/HelloLua/Resources/Resources/background.mp3.REMOVED.git-id b/samples/Lua/HelloLua/Resources/Resources/background.mp3.REMOVED.git-id
deleted file mode 100644
index cfc16a8a4e..0000000000
--- a/samples/Lua/HelloLua/Resources/Resources/background.mp3.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-aec1c0a8c8068377fddca5ddd32084d8c3c3c419
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/Resources/background.mp3.REMOVED.git-id b/samples/Lua/HelloLua/Resources/background.mp3.REMOVED.git-id
deleted file mode 100644
index cfc16a8a4e..0000000000
--- a/samples/Lua/HelloLua/Resources/background.mp3.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-aec1c0a8c8068377fddca5ddd32084d8c3c3c419
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/Resources/farm.jpg.REMOVED.git-id b/samples/Lua/HelloLua/Resources/farm.jpg.REMOVED.git-id
deleted file mode 100644
index 4609f3cf02..0000000000
--- a/samples/Lua/HelloLua/Resources/farm.jpg.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-d7290c34702d1c6bdb368acb060d93b42d5deff8
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/Resources/hello.lua b/samples/Lua/HelloLua/Resources/hello.lua
deleted file mode 100644
index 770e922c9d..0000000000
--- a/samples/Lua/HelloLua/Resources/hello.lua
+++ /dev/null
@@ -1,209 +0,0 @@
-require "Cocos2d"
--- cclog
-cclog = function(...)
-    print(string.format(...))
-end
-
--- for CCLuaEngine traceback
-function __G__TRACKBACK__(msg)
-    cclog("----------------------------------------")
-    cclog("LUA ERROR: " .. tostring(msg) .. "\n")
-    cclog(debug.traceback())
-    cclog("----------------------------------------")
-end
-
-local function main()
-    -- avoid memory leak
-    collectgarbage("setpause", 100)
-    collectgarbage("setstepmul", 5000)
-
-    --support debug
-    local targetPlatform = cc.Application:getInstance():getTargetPlatform()
-    if (cc.PLATFORM_OS_IPHONE == targetPlatform) or (cc.PLATFORM_OS_IPAD == targetPlatform) or 
-       (cc.PLATFORM_OS_ANDROID == targetPlatform) or (cc.PLATFORM_OS_WINDOWS == targetPlatform) or
-       (cc.PLATFORM_OS_MAC == targetPlatform) then
-        local host = 'localhost' -- please change localhost to your PC's IP for on-device debugging
-        require('mobdebug').start(host)
-    end
-    require "hello2"
-    cclog("result is " .. myadd(1, 1))
-
-    ---------------
-
-    local visibleSize = cc.Director:getInstance():getVisibleSize()
-    local origin = cc.Director:getInstance():getVisibleOrigin()
-
-    -- add the moving dog
-    local function creatDog()
-        local frameWidth = 105
-        local frameHeight = 95
-
-        -- create dog animate
-        local textureDog = cc.TextureCache:getInstance():addImage("dog.png")
-        local rect = cc.rect(0, 0, frameWidth, frameHeight)
-        local frame0 = cc.SpriteFrame:createWithTexture(textureDog, rect)
-        rect = cc.rect(frameWidth, 0, frameWidth, frameHeight)
-        local frame1 = cc.SpriteFrame:createWithTexture(textureDog, rect)
-
-        local spriteDog = cc.Sprite:createWithSpriteFrame(frame0)
-        spriteDog.isPaused = false
-        spriteDog:setPosition(origin.x, origin.y + visibleSize.height / 4 * 3)
---[[
-        local animFrames = CCArray:create()
-
-        animFrames:addObject(frame0)
-        animFrames:addObject(frame1)
-]]--
-
-        local animation = cc.Animation:createWithSpriteFrames({frame0,frame1}, 0.5)
-        local animate = cc.Animate:create(animation);
-        spriteDog:runAction(cc.RepeatForever:create(animate))
-
-        -- moving dog at every frame
-        local function tick()
-            if spriteDog.isPaused then return end
-            local x, y = spriteDog:getPosition()
-            if x > origin.x + visibleSize.width then
-                x = origin.x
-            else
-                x = x + 1
-            end
-
-            spriteDog:setPositionX(x)
-        end
-
-        cc.Director:getInstance():getScheduler():scheduleScriptFunc(tick, 0, false)
-
-        return spriteDog
-    end
-
-    -- create farm
-    local function createLayerFarm()
-        local layerFarm = cc.Layer:create()
-
-        -- add in farm background
-        local bg = cc.Sprite:create("farm.jpg")
-        bg:setPosition(origin.x + visibleSize.width / 2 + 80, origin.y + visibleSize.height / 2)
-        layerFarm:addChild(bg)
-
-        -- add land sprite
-        for i = 0, 3 do
-            for j = 0, 1 do
-                local spriteLand = cc.Sprite:create("land.png")
-                spriteLand:setPosition(200 + j * 180 - i % 2 * 90, 10 + i * 95 / 2)
-                layerFarm:addChild(spriteLand)
-            end
-        end
-
-        -- add crop
-        local frameCrop = cc.SpriteFrame:create("crop.png", cc.rect(0, 0, 105, 95))
-        for i = 0, 3 do
-            for j = 0, 1 do
-                local spriteCrop = cc.Sprite:createWithSpriteFrame(frameCrop);
-                spriteCrop:setPosition(10 + 200 + j * 180 - i % 2 * 90, 30 + 10 + i * 95 / 2)
-                layerFarm:addChild(spriteCrop)
-            end
-        end
-
-        -- add moving dog
-        local spriteDog = creatDog()
-        layerFarm:addChild(spriteDog)
-
-        -- handing touch events
-        local touchBeginPoint = nil
-        local function onTouchBegan(touch, event)
-            local location = touch:getLocation()
-            cclog("onTouchBegan: %0.2f, %0.2f", location.x, location.y)
-            touchBeginPoint = {x = location.x, y = location.y}
-            spriteDog.isPaused = true
-            -- CCTOUCHBEGAN event must return true
-            return true
-        end
-
-        local function onTouchMoved(touch, event)
-            local location = touch:getLocation()
-            cclog("onTouchMoved: %0.2f, %0.2f", location.x, location.y)
-            if touchBeginPoint then
-                local cx, cy = layerFarm:getPosition()
-                layerFarm:setPosition(cx + location.x - touchBeginPoint.x,
-                                      cy + location.y - touchBeginPoint.y)
-                touchBeginPoint = {x = location.x, y = location.y}
-            end
-        end
-
-        local function onTouchEnded(touch, event)
-            local location = touch:getLocation()
-            cclog("onTouchEnded: %0.2f, %0.2f", location.x, location.y)
-            touchBeginPoint = nil
-            spriteDog.isPaused = false
-        end
-
-        local listener = cc.EventListenerTouchOneByOne:create()
-        listener:registerScriptHandler(onTouchBegan,cc.Handler.EVENT_TOUCH_BEGAN )
-        listener:registerScriptHandler(onTouchMoved,cc.Handler.EVENT_TOUCH_MOVED )
-        listener:registerScriptHandler(onTouchEnded,cc.Handler.EVENT_TOUCH_ENDED )
-        local eventDispatcher = layerFarm:getEventDispatcher()
-        eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layerFarm)
-
-        return layerFarm
-    end
-
-
-    -- create menu
-    local function createLayerMenu()
-        local layerMenu = cc.Layer:create()
-
-        local menuPopup, menuTools, effectID
-
-        local function menuCallbackClosePopup()
-            -- stop test sound effect
-            cc.SimpleAudioEngine:getInstance():stopEffect(effectID)
-            menuPopup:setVisible(false)
-        end
-
-        local function menuCallbackOpenPopup()
-            -- loop test sound effect
-            local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav")
-            effectID = cc.SimpleAudioEngine:getInstance():playEffect(effectPath)
-            menuPopup:setVisible(true)
-        end
-
-        -- add a popup menu
-        local menuPopupItem = cc.MenuItemImage:create("menu2.png", "menu2.png")
-        menuPopupItem:setPosition(0, 0)
-        menuPopupItem:registerScriptTapHandler(menuCallbackClosePopup)
-        menuPopup = cc.Menu:create(menuPopupItem)
-        menuPopup:setPosition(origin.x + visibleSize.width / 2, origin.y + visibleSize.height / 2)
-        menuPopup:setVisible(false)
-        layerMenu:addChild(menuPopup)
-        
-        -- add the left-bottom "tools" menu to invoke menuPopup
-        local menuToolsItem = cc.MenuItemImage:create("menu1.png", "menu1.png")
-        menuToolsItem:setPosition(0, 0)
-        menuToolsItem:registerScriptTapHandler(menuCallbackOpenPopup)
-        menuTools = cc.Menu:create(menuToolsItem)
-        local itemWidth = menuToolsItem:getContentSize().width
-        local itemHeight = menuToolsItem:getContentSize().height
-        menuTools:setPosition(origin.x + itemWidth/2, origin.y + itemHeight/2)
-        layerMenu:addChild(menuTools)
-
-        return layerMenu
-    end
-
-    -- play background music, preload effect
-
-    -- uncomment below for the BlackBerry version
-    -- local bgMusicPath = CCFileUtils:getInstance():fullPathForFilename("background.ogg")
-    local bgMusicPath = cc.FileUtils:getInstance():fullPathForFilename("background.mp3")
-    cc.SimpleAudioEngine:getInstance():playMusic(bgMusicPath, true)
-    local effectPath = cc.FileUtils:getInstance():fullPathForFilename("effect1.wav")
-    cc.SimpleAudioEngine:getInstance():preloadEffect(effectPath)
-
-    -- run
-    local sceneGame = cc.Scene:create()
-    sceneGame:addChild(createLayerFarm())
-    sceneGame:addChild(createLayerMenu())
-    cc.Director:getInstance():runWithScene(sceneGame)
-end
-
-xpcall(main, __G__TRACKBACK__)
diff --git a/samples/Lua/HelloLua/Resources/hello2.lua b/samples/Lua/HelloLua/Resources/hello2.lua
deleted file mode 100644
index 27158aa788..0000000000
--- a/samples/Lua/HelloLua/Resources/hello2.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-function myadd(x, y)
-    return x + y
-end
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/Resources/mobdebug.lua b/samples/Lua/HelloLua/Resources/mobdebug.lua
deleted file mode 100644
index 31ef8af06b..0000000000
--- a/samples/Lua/HelloLua/Resources/mobdebug.lua
+++ /dev/null
@@ -1,1465 +0,0 @@
---
--- MobDebug 0.542
--- Copyright 2011-13 Paul Kulchenko
--- Based on RemDebug 1.0 Copyright Kepler Project 2005
---
-
-local mobdebug = {
-  _NAME = "mobdebug",
-  _VERSION = 0.542,
-  _COPYRIGHT = "Paul Kulchenko",
-  _DESCRIPTION = "Mobile Remote Debugger for the Lua programming language",
-  port = os and os.getenv and os.getenv("MOBDEBUG_PORT") or 8172,
-  checkcount = 200,
-  yieldtimeout = 0.02,
-}
-
-local coroutine = coroutine
-local error = error
-local getfenv = getfenv
-local setfenv = setfenv
-local loadstring = loadstring or load -- "load" replaced "loadstring" in Lua 5.2
-local io = io
-local os = os
-local pairs = pairs
-local require = require
-local setmetatable = setmetatable
-local string = string
-local tonumber = tonumber
-local unpack = table.unpack or unpack
-local rawget = rawget
-
--- if strict.lua is used, then need to avoid referencing some global
--- variables, as they can be undefined;
--- use rawget to to avoid complaints from strict.lua at run-time.
--- it's safe to do the initialization here as all these variables
--- should get defined values (of any) before the debugging starts.
--- there is also global 'wx' variable, which is checked as part of
--- the debug loop as 'wx' can be loaded at any time during debugging.
-local genv = _G or _ENV
-local jit = rawget(genv, "jit")
-local MOAICoroutine = rawget(genv, "MOAICoroutine")
-
-if not setfenv then -- Lua 5.2
-  -- based on http://lua-users.org/lists/lua-l/2010-06/msg00314.html
-  -- this assumes f is a function
-  local function findenv(f)
-    local level = 1
-    repeat
-      local name, value = debug.getupvalue(f, level)
-      if name == '_ENV' then return level, value end
-      level = level + 1
-    until name == nil
-    return nil end
-  getfenv = function (f) return(select(2, findenv(f)) or _G) end
-  setfenv = function (f, t)
-    local level = findenv(f)
-    if level then debug.setupvalue(f, level, t) end
-    return f end
-end
-
--- check for OS and convert file names to lower case on windows
--- (its file system is case insensitive, but case preserving), as setting a
--- breakpoint on x:\Foo.lua will not work if the file was loaded as X:\foo.lua.
--- OSX and Windows behave the same way (case insensitive, but case preserving)
-local iscasepreserving = os and os.getenv and (os.getenv('WINDIR')
-  or (os.getenv('OS') or ''):match('[Ww]indows')
-  or os.getenv('DYLD_LIBRARY_PATH'))
-  or not io.open("/proc")
-
--- turn jit off based on Mike Pall's comment in this discussion:
--- http://www.freelists.org/post/luajit/Debug-hooks-and-JIT,2
--- "You need to turn it off at the start if you plan to receive
--- reliable hook calls at any later point in time."
-if jit and jit.off then jit.off() end
-
-local socket = require "socket"
-local debug = require "debug"
-local coro_debugger
-local coro_debugee
-local coroutines = {}; setmetatable(coroutines, {__mode = "k"}) -- "weak" keys
-local events = { BREAK = 1, WATCH = 2, RESTART = 3, STACK = 4 }
-local breakpoints = {}
-local watches = {}
-local lastsource
-local lastfile
-local watchescnt = 0
-local abort -- default value is nil; this is used in start/loop distinction
-local seen_hook = false
-local checkcount = 0
-local step_into = false
-local step_over = false
-local step_level = 0
-local stack_level = 0
-local server
-local buf
-local outputs = {}
-local iobase = {print = print}
-local basedir = ""
-local deferror = "execution aborted at default debugee"
-local debugee = function () 
-  local a = 1
-  for _ = 1, 10 do a = a + 1 end
-  error(deferror)
-end
-local function q(s) return s:gsub('([%(%)%.%%%+%-%*%?%[%^%$%]])','%%%1') end
-
-local serpent = (function() ---- include Serpent module for serialization
-local n, v = "serpent", 0.25 -- (C) 2012-13 Paul Kulchenko; MIT License
-local c, d = "Paul Kulchenko", "Lua serializer and pretty printer"
-local snum = {[tostring(1/0)]='1/0 --[[math.huge]]',[tostring(-1/0)]='-1/0 --[[-math.huge]]',[tostring(0/0)]='0/0'}
-local badtype = {thread = true, userdata = true, cdata = true}
-local keyword, globals, G = {}, {}, (_G or _ENV)
-for _,k in ipairs({'and', 'break', 'do', 'else', 'elseif', 'end', 'false',
-  'for', 'function', 'goto', 'if', 'in', 'local', 'nil', 'not', 'or', 'repeat',
-  'return', 'then', 'true', 'until', 'while'}) do keyword[k] = true end
-for k,v in pairs(G) do globals[v] = k end -- build func to name mapping
-for _,g in ipairs({'coroutine', 'debug', 'io', 'math', 'string', 'table', 'os'}) do
-  for k,v in pairs(G[g]) do globals[v] = g..'.'..k end end
-
-local function s(t, opts)
-  local name, indent, fatal, maxnum = opts.name, opts.indent, opts.fatal, opts.maxnum
-  local sparse, custom, huge = opts.sparse, opts.custom, not opts.nohuge
-  local space, maxl = (opts.compact and '' or ' '), (opts.maxlevel or math.huge)
-  local iname, comm = '_'..(name or ''), opts.comment and (tonumber(opts.comment) or math.huge)
-  local seen, sref, syms, symn = {}, {'local '..iname..'={}'}, {}, 0
-  local function gensym(val) return '_'..(tostring(tostring(val)):gsub("[^%w]",""):gsub("(%d%w+)",
-    -- tostring(val) is needed because __tostring may return a non-string value
-    function(s) if not syms[s] then symn = symn+1; syms[s] = symn end return syms[s] end)) end
-  local function safestr(s) return type(s) == "number" and (huge and snum[tostring(s)] or s)
-    or type(s) ~= "string" and tostring(s) -- escape NEWLINE/010 and EOF/026
-    or ("%q"):format(s):gsub("\010","n"):gsub("\026","\\026") end
-  local function comment(s,l) return comm and (l or 0) < comm and ' --[['..tostring(s)..']]' or '' end
-  local function globerr(s,l) return globals[s] and globals[s]..comment(s,l) or not fatal
-    and safestr(select(2, pcall(tostring, s))) or error("Can't serialize "..tostring(s)) end
-  local function safename(path, name) -- generates foo.bar, foo[3], or foo['b a r']
-    local n = name == nil and '' or name
-    local plain = type(n) == "string" and n:match("^[%l%u_][%w_]*$") and not keyword[n]
-    local safe = plain and n or '['..safestr(n)..']'
-    return (path or '')..(plain and path and '.' or '')..safe, safe end
-  local alphanumsort = type(opts.sortkeys) == 'function' and opts.sortkeys or function(k, o, n)  -- k=keys, o=originaltable, n=padding
-    local maxn, to = tonumber(n) or 12, {number = 'a', string = 'b'}
-    local function padnum(d) return ("%0"..maxn.."d"):format(d) end
-    table.sort(k, function(a,b)
-      -- sort numeric keys first: k[key] is non-nil for numeric keys
-      return (k[a] and 0 or to[type(a)] or 'z')..(tostring(a):gsub("%d+",padnum))
-           < (k[b] and 0 or to[type(b)] or 'z')..(tostring(b):gsub("%d+",padnum)) end) end
-  local function val2str(t, name, indent, insref, path, plainindex, level)
-    local ttype, level, mt = type(t), (level or 0), getmetatable(t)
-    local spath, sname = safename(path, name)
-    local tag = plainindex and
-      ((type(name) == "number") and '' or name..space..'='..space) or
-      (name ~= nil and sname..space..'='..space or '')
-    if seen[t] then -- already seen this element
-      sref[#sref+1] = spath..space..'='..space..seen[t]
-      return tag..'nil'..comment('ref', level) end
-    if type(mt) == 'table' and (mt.__serialize or mt.__tostring) then -- knows how to serialize itself
-      seen[t] = insref or spath
-      if mt.__serialize then t = mt.__serialize(t) else t = tostring(t) end
-      ttype = type(t) end -- new value falls through to be serialized
-    if ttype == "table" then
-      if level >= maxl then return tag..'{}'..comment('max', level) end
-      seen[t] = insref or spath
-      if next(t) == nil then return tag..'{}'..comment(t, level) end -- table empty
-      local maxn, o, out = math.min(#t, maxnum or #t), {}, {}
-      for key = 1, maxn do o[key] = key end
-      if not maxnum or #o < maxnum then
-        local n = #o -- n = n + 1; o[n] is much faster than o[#o+1] on large tables
-        for key in pairs(t) do if o[key] ~= key then n = n + 1; o[n] = key end end end
-      if maxnum and #o > maxnum then o[maxnum+1] = nil end
-      if opts.sortkeys and #o > maxn then alphanumsort(o, t, opts.sortkeys) end
-      local sparse = sparse and #o > maxn -- disable sparsness if only numeric keys (shorter output)
-      for n, key in ipairs(o) do
-        local value, ktype, plainindex = t[key], type(key), n <= maxn and not sparse
-        if opts.valignore and opts.valignore[value] -- skip ignored values; do nothing
-        or opts.keyallow and not opts.keyallow[key]
-        or opts.valtypeignore and opts.valtypeignore[type(value)] -- skipping ignored value types
-        or sparse and value == nil then -- skipping nils; do nothing
-        elseif ktype == 'table' or ktype == 'function' or badtype[ktype] then
-          if not seen[key] and not globals[key] then
-            sref[#sref+1] = 'placeholder'
-            local sname = safename(iname, gensym(key)) -- iname is table for local variables
-            sref[#sref] = val2str(key,sname,indent,sname,iname,true) end
-          sref[#sref+1] = 'placeholder'
-          local path = seen[t]..'['..(seen[key] or globals[key] or gensym(key))..']'
-          sref[#sref] = path..space..'='..space..(seen[value] or val2str(value,nil,indent,path))
-        else
-          out[#out+1] = val2str(value,key,indent,insref,seen[t],plainindex,level+1)
-        end
-      end
-      local prefix = string.rep(indent or '', level)
-      local head = indent and '{\n'..prefix..indent or '{'
-      local body = table.concat(out, ','..(indent and '\n'..prefix..indent or space))
-      local tail = indent and "\n"..prefix..'}' or '}'
-      return (custom and custom(tag,head,body,tail) or tag..head..body..tail)..comment(t, level)
-    elseif badtype[ttype] then
-      seen[t] = insref or spath
-      return tag..globerr(t, level)
-    elseif ttype == 'function' then
-      seen[t] = insref or spath
-      local ok, res = pcall(string.dump, t)
-      local func = ok and ((opts.nocode and "function() --[[..skipped..]] end" or
-        "loadstring("..safestr(res)..",'@serialized')")..comment(t, level))
-      return tag..(func or globerr(t, level))
-    else return tag..safestr(t) end -- handle all other types
-  end
-  local sepr = indent and "\n" or ";"..space
-  local body = val2str(t, name, indent) -- this call also populates sref
-  local tail = #sref>1 and table.concat(sref, sepr)..sepr or ''
-  local warn = opts.comment and #sref>1 and space.."--[[incomplete output with shared/self-references skipped]]" or ''
-  return not name and body..warn or "do local "..body..sepr..tail.."return "..name..sepr.."end"
-end
-
-local function merge(a, b) if b then for k,v in pairs(b) do a[k] = v end end; return a; end
-return { _NAME = n, _COPYRIGHT = c, _DESCRIPTION = d, _VERSION = v, serialize = s,
-  dump = function(a, opts) return s(a, merge({name = '_', compact = true, sparse = true}, opts)) end,
-  line = function(a, opts) return s(a, merge({sortkeys = true, comment = true}, opts)) end,
-  block = function(a, opts) return s(a, merge({indent = '  ', sortkeys = true, comment = true}, opts)) end }
-end)() ---- end of Serpent module
-
-local function removebasedir(path, basedir)
-  if iscasepreserving then
-    -- check if the lowercased path matches the basedir
-    -- if so, return substring of the original path (to not lowercase it)
-    return path:lower():find('^'..q(basedir:lower()))
-      and path:sub(#basedir+1) or path
-  else
-    return string.gsub(path, '^'..q(basedir), '')
-  end
-end
-
-local function stack(start)
-  local function vars(f)
-    local func = debug.getinfo(f, "f").func
-    local i = 1
-    local locals = {}
-    while true do
-      local name, value = debug.getlocal(f, i)
-      if not name then break end
-      if string.sub(name, 1, 1) ~= '(' then locals[name] = {value, tostring(value)} end
-      i = i + 1
-    end
-    i = 1
-    local ups = {}
-    while func and true do -- check for func as it may be nil for tail calls
-      local name, value = debug.getupvalue(func, i)
-      if not name then break end
-      ups[name] = {value, tostring(value)}
-      i = i + 1
-    end
-    return locals, ups
-  end
-
-  local stack = {}
-  for i = (start or 0), 100 do
-    local source = debug.getinfo(i, "Snl")
-    if not source then break end
-
-    local src = source.source
-    if src:find("@") == 1 then
-      src = src:sub(2):gsub("\\", "/")
-      if src:find("%./") == 1 then src = src:sub(3) end
-    end
-
-    table.insert(stack, { -- remove basedir from source
-      {source.name, removebasedir(src, basedir), source.linedefined,
-       source.currentline, source.what, source.namewhat, source.short_src},
-      vars(i+1)})
-    if source.what == 'main' then break end
-  end
-  return stack
-end
-
-local function set_breakpoint(file, line)
-  if file == '-' and lastfile then file = lastfile
-  elseif iscasepreserving then file = string.lower(file) end
-  if not breakpoints[line] then breakpoints[line] = {} end
-  breakpoints[line][file] = true
-end
-
-local function remove_breakpoint(file, line)
-  if file == '-' and lastfile then file = lastfile
-  elseif iscasepreserving then file = string.lower(file) end
-  if breakpoints[line] then breakpoints[line][file] = nil end
-end
-
-local function has_breakpoint(file, line)
-  return breakpoints[line]
-     and breakpoints[line][iscasepreserving and string.lower(file) or file]
-end
-
-local function restore_vars(vars)
-  if type(vars) ~= 'table' then return end
-
-  -- locals need to be processed in the reverse order, starting from
-  -- the inner block out, to make sure that the localized variables
-  -- are correctly updated with only the closest variable with
-  -- the same name being changed
-  -- first loop find how many local variables there is, while
-  -- the second loop processes them from i to 1
-  local i = 1
-  while true do
-    local name = debug.getlocal(3, i)
-    if not name then break end
-    i = i + 1
-  end
-  i = i - 1
-  local written_vars = {}
-  while i > 0 do
-    local name = debug.getlocal(3, i)
-    if not written_vars[name] then
-      if string.sub(name, 1, 1) ~= '(' then
-        debug.setlocal(3, i, rawget(vars, name))
-      end
-      written_vars[name] = true
-    end
-    i = i - 1
-  end
-
-  i = 1
-  local func = debug.getinfo(3, "f").func
-  while true do
-    local name = debug.getupvalue(func, i)
-    if not name then break end
-    if not written_vars[name] then
-      if string.sub(name, 1, 1) ~= '(' then
-        debug.setupvalue(func, i, rawget(vars, name))
-      end
-      written_vars[name] = true
-    end
-    i = i + 1
-  end
-end
-
-local function capture_vars(level)
-  local vars = {}
-  local func = debug.getinfo(level or 3, "f").func
-  local i = 1
-  while true do
-    local name, value = debug.getupvalue(func, i)
-    if not name then break end
-    if string.sub(name, 1, 1) ~= '(' then vars[name] = value end
-    i = i + 1
-  end
-  i = 1
-  while true do
-    local name, value = debug.getlocal(level or 3, i)
-    if not name then break end
-    if string.sub(name, 1, 1) ~= '(' then vars[name] = value end
-    i = i + 1
-  end
-  -- returned 'vars' table plays a dual role: (1) it captures local values
-  -- and upvalues to be restored later (in case they are modified in "eval"),
-  -- and (2) it provides an environment for evaluated chunks.
-  -- getfenv(func) is needed to provide proper environment for functions,
-  -- including access to globals, but this causes vars[name] to fail in
-  -- restore_vars on local variables or upvalues with `nil` values when
-  -- 'strict' is in effect. To avoid this `rawget` is used in restore_vars.
-  setmetatable(vars, { __index = getfenv(func), __newindex = getfenv(func) })
-  return vars
-end
-
-local function stack_depth(start_depth)
-  for i = start_depth, 0, -1 do
-    if debug.getinfo(i, "l") then return i+1 end
-  end
-  return start_depth
-end
-
-local function is_safe(stack_level)
-  -- the stack grows up: 0 is getinfo, 1 is is_safe, 2 is debug_hook, 3 is user function
-  if stack_level == 3 then return true end
-  for i = 3, stack_level do
-    -- return if it is not safe to abort
-    local info = debug.getinfo(i, "S")
-    if not info then return true end
-    if info.what == "C" then return false end
-  end
-  return true
-end
-
-local function in_debugger()
-  local this = debug.getinfo(1, "S").source
-  -- only need to check few frames as mobdebug frames should be close
-  for i = 3, 7 do
-    local info = debug.getinfo(i, "S")
-    if not info then return false end
-    if info.source == this then return true end
-  end
-  return false
-end
-
-local function is_pending(peer)
-  -- if there is something already in the buffer, skip check
-  if not buf and checkcount >= mobdebug.checkcount then
-    peer:settimeout(0) -- non-blocking
-    buf = peer:receive(1)
-    peer:settimeout() -- back to blocking
-    checkcount = 0
-  end
-  return buf
-end
-
-local function debug_hook(event, line)
-  -- (1) LuaJIT needs special treatment. Because debug_hook is set for
-  -- *all* coroutines, and not just the one being debugged as in regular Lua
-  -- (http://lua-users.org/lists/lua-l/2011-06/msg00513.html),
-  -- need to avoid debugging mobdebug's own code as LuaJIT doesn't
-  -- always correctly generate call/return hook events (there are more
-  -- calls than returns, which breaks stack depth calculation and
-  -- 'step' and 'step over' commands stop working; possibly because
-  -- 'tail return' events are not generated by LuaJIT).
-  -- the next line checks if the debugger is run under LuaJIT and if
-  -- one of debugger methods is present in the stack, it simply returns.
-  if jit then
-    -- when luajit is compiled with LUAJIT_ENABLE_LUA52COMPAT,
-    -- coroutine.running() returns non-nil for the main thread.
-    local coro, main = coroutine.running()
-    if not coro or main then coro = 'main' end
-    local disabled = coroutines[coro] == false
-      or coroutines[coro] == nil and coro ~= (coro_debugee or 'main')
-    if coro_debugee and disabled or not coro_debugee and (disabled or in_debugger())
-    then return end
-  end
-
-  -- (2) check if abort has been requested and it's safe to abort
-  if abort and is_safe(stack_level) then error(abort) end
-
-  -- (3) also check if this debug hook has not been visited for any reason.
-  -- this check is needed to avoid stepping in too early
-  -- (for example, when coroutine.resume() is executed inside start()).
-  if not seen_hook and in_debugger() then return end
-
-  if event == "call" then
-    stack_level = stack_level + 1
-  elseif event == "return" or event == "tail return" then
-    stack_level = stack_level - 1
-  elseif event == "line" then
-    -- may need to fall through because of the following:
-    -- (1) step_into
-    -- (2) step_over and stack_level <= step_level (need stack_level)
-    -- (3) breakpoint; check for line first as it's known; then for file
-    -- (4) socket call (only do every Xth check)
-    -- (5) at least one watch is registered
-    if not (
-      step_into or step_over or breakpoints[line] or watchescnt > 0
-      or is_pending(server)
-    ) then checkcount = checkcount + 1; return end
-
-    checkcount = mobdebug.checkcount -- force check on the next command
-
-    -- this is needed to check if the stack got shorter or longer.
-    -- unfortunately counting call/return calls is not reliable.
-    -- the discrepancy may happen when "pcall(load, '')" call is made
-    -- or when "error()" is called in a function.
-    -- in either case there are more "call" than "return" events reported.
-    -- this validation is done for every "line" event, but should be "cheap"
-    -- as it checks for the stack to get shorter (or longer by one call).
-    -- start from one level higher just in case we need to grow the stack.
-    -- this may happen after coroutine.resume call to a function that doesn't
-    -- have any other instructions to execute. it triggers three returns:
-    -- "return, tail return, return", which needs to be accounted for.
-    stack_level = stack_depth(stack_level+1)
-
-    local caller = debug.getinfo(2, "S")
-
-    -- grab the filename and fix it if needed
-    local file = lastfile
-    if (lastsource ~= caller.source) then
-      file, lastsource = caller.source, caller.source
-      -- technically, users can supply names that may not use '@',
-      -- for example when they call loadstring('...', 'filename.lua').
-      -- Unfortunately, there is no reliable/quick way to figure out
-      -- what is the filename and what is the source code.
-      -- The following will work if the supplied filename uses Unix path.
-      if file:find("^@") then
-        file = file:gsub("^@", ""):gsub("\\", "/")
-        -- need this conversion to be applied to relative and absolute
-        -- file names as you may write "require 'Foo'" to
-        -- load "foo.lua" (on a case insensitive file system) and breakpoints
-        -- set on foo.lua will not work if not converted to the same case.
-        if iscasepreserving then file = string.lower(file) end
-        if file:find("%./") == 1 then file = file:sub(3)
-        else file = file:gsub('^'..q(basedir), '') end
-        -- some file systems allow newlines in file names; remove these.
-        file = file:gsub("\n", ' ')
-      else
-        -- this is either a file name coming from loadstring("chunk", "file"),
-        -- or the actual source code that needs to be serialized (as it may
-        -- include newlines); assume it's a file name if it's all on one line.
-        file = file:find("[\r\n]") and serpent.line(file) or file
-      end
-
-      -- set to true if we got here; this only needs to be done once per
-      -- session, so do it here to at least avoid setting it for every line.
-      seen_hook = true
-      lastfile = file
-    end
-
-    local vars, status, res
-    if (watchescnt > 0) then
-      vars = capture_vars()
-      for index, value in pairs(watches) do
-        setfenv(value, vars)
-        local ok, fired = pcall(value)
-        if ok and fired then
-          status, res = coroutine.resume(coro_debugger, events.WATCH, vars, file, line, index)
-          break -- any one watch is enough; don't check multiple times
-        end
-      end
-    end
-
-    -- need to get into the "regular" debug handler, but only if there was
-    -- no watch that was fired. If there was a watch, handle its result.
-    local getin = (status == nil) and
-      (step_into
-      or (step_over and stack_level <= step_level)
-      or has_breakpoint(file, line)
-      or is_pending(server))
-
-    if getin then
-      vars = vars or capture_vars()
-      step_into = false
-      step_over = false
-      status, res = coroutine.resume(coro_debugger, events.BREAK, vars, file, line)
-    end
-
-    -- handle 'stack' command that provides stack() information to the debugger
-    if status and res == 'stack' then
-      while status and res == 'stack' do
-        -- resume with the stack trace and variables
-        if vars then restore_vars(vars) end -- restore vars so they are reflected in stack values
-        -- this may fail if __tostring method fails at run-time
-        local ok, snapshot = pcall(stack, 4)
-        status, res = coroutine.resume(coro_debugger, ok and events.STACK or events.BREAK, snapshot, file, line)
-      end
-    end
-
-    -- need to recheck once more as resume after 'stack' command may
-    -- return something else (for example, 'exit'), which needs to be handled
-    if status and res and res ~= 'stack' then
-      if abort == nil and res == "exit" then os.exit(1); return end
-      abort = res
-      -- only abort if safe; if not, there is another (earlier) check inside
-      -- debug_hook, which will abort execution at the first safe opportunity
-      if is_safe(stack_level) then error(abort) end
-    elseif not status and res then
-      error(res, 2) -- report any other (internal) errors back to the application
-    end
-
-    if vars then restore_vars(vars) end
-  end
-end
-
-local function stringify_results(status, ...)
-  if not status then return status, ... end -- on error report as it
-
-  local t = {...}
-  for i,v in pairs(t) do -- stringify each of the returned values
-    local ok, res = pcall(serpent.line, v, {nocode = true, comment = 1})
-    t[i] = ok and res or ("%q"):format(res):gsub("\010","n"):gsub("\026","\\026")
-  end
-  -- stringify table with all returned values
-  -- this is done to allow each returned value to be used (serialized or not)
-  -- intependently and to preserve "original" comments
-  return pcall(serpent.dump, t, {sparse = false})
-end
-
-local function debugger_loop(sev, svars, sfile, sline)
-  local command
-  local app, osname
-  local eval_env = svars or {}
-  local function emptyWatch () return false end
-  local loaded = {}
-  for k in pairs(package.loaded) do loaded[k] = true end
-
-  while true do
-    local line, err
-    local wx = rawget(genv, "wx") -- use rawread to make strict.lua happy
-    if (wx or mobdebug.yield) and server.settimeout then server:settimeout(mobdebug.yieldtimeout) end
-    while true do
-      line, err = server:receive()
-      if not line and err == "timeout" then
-        -- yield for wx GUI applications if possible to avoid "busyness"
-        app = app or (wx and wx.wxGetApp and wx.wxGetApp())
-        if app then
-          local win = app:GetTopWindow()
-          local inloop = app:IsMainLoopRunning()
-          osname = osname or wx.wxPlatformInfo.Get():GetOperatingSystemFamilyName()
-          if win and not inloop then
-            -- process messages in a regular way
-            -- and exit as soon as the event loop is idle
-            if osname == 'Unix' then wx.wxTimer(app):Start(10, true) end
-            local exitLoop = function()
-              win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_IDLE)
-              win:Disconnect(wx.wxID_ANY, wx.wxID_ANY, wx.wxEVT_TIMER)
-              app:ExitMainLoop()
-            end
-            win:Connect(wx.wxEVT_IDLE, exitLoop)
-            win:Connect(wx.wxEVT_TIMER, exitLoop)
-            app:MainLoop()
-          end
-        elseif mobdebug.yield then mobdebug.yield()
-        end
-      elseif not line and err == "closed" then
-        error("Debugger connection unexpectedly closed", 0)
-      else
-        -- if there is something in the pending buffer, prepend it to the line
-        if buf then line = buf .. line; buf = nil end
-        break
-      end
-    end
-    if server.settimeout then server:settimeout() end -- back to blocking
-    command = string.sub(line, string.find(line, "^[A-Z]+"))
-    if command == "SETB" then
-      local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$")
-      if file and line then
-        set_breakpoint(file, tonumber(line))
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "DELB" then
-      local _, _, _, file, line = string.find(line, "^([A-Z]+)%s+(.-)%s+(%d+)%s*$")
-      if file and line then
-        remove_breakpoint(file, tonumber(line))
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "EXEC" then
-      local _, _, chunk = string.find(line, "^[A-Z]+%s+(.+)$")
-      if chunk then 
-        local func, res = loadstring(chunk)
-        local status
-        if func then
-          setfenv(func, eval_env)
-          status, res = stringify_results(pcall(func))
-        end
-        if status then
-          server:send("200 OK " .. #res .. "\n")
-          server:send(res)
-        else
-          server:send("401 Error in Expression " .. #res .. "\n")
-          server:send(res)
-        end
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "LOAD" then
-      local _, _, size, name = string.find(line, "^[A-Z]+%s+(%d+)%s+(%S.-)%s*$")
-      size = tonumber(size)
-
-      if abort == nil then -- no LOAD/RELOAD allowed inside start()
-        if size > 0 then server:receive(size) end
-        if sfile and sline then
-          server:send("201 Started " .. sfile .. " " .. sline .. "\n")
-        else
-          server:send("200 OK 0\n")
-        end
-      else
-        -- reset environment to allow required modules to load again
-        -- remove those packages that weren't loaded when debugger started
-        for k in pairs(package.loaded) do
-          if not loaded[k] then package.loaded[k] = nil end
-        end
-
-        if size == 0 and name == '-' then -- RELOAD the current script being debugged
-          server:send("200 OK 0\n")
-          coroutine.yield("load")
-        else
-          -- receiving 0 bytes blocks (at least in luasocket 2.0.2), so skip reading
-          local chunk = size == 0 and "" or server:receive(size)
-          if chunk then -- LOAD a new script for debugging
-            local func, res = loadstring(chunk, "@"..name)
-            if func then
-              server:send("200 OK 0\n")
-              debugee = func
-              coroutine.yield("load")
-            else
-              server:send("401 Error in Expression " .. #res .. "\n")
-              server:send(res)
-            end
-          else
-            server:send("400 Bad Request\n")
-          end
-        end
-      end
-    elseif command == "SETW" then
-      local _, _, exp = string.find(line, "^[A-Z]+%s+(.+)%s*$")
-      if exp then 
-        local func, res = loadstring("return(" .. exp .. ")")
-        if func then
-          watchescnt = watchescnt + 1
-          local newidx = #watches + 1
-          watches[newidx] = func
-          server:send("200 OK " .. newidx .. "\n") 
-        else
-          server:send("401 Error in Expression " .. #res .. "\n")
-          server:send(res)
-        end
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "DELW" then
-      local _, _, index = string.find(line, "^[A-Z]+%s+(%d+)%s*$")
-      index = tonumber(index)
-      if index > 0 and index <= #watches then
-        watchescnt = watchescnt - (watches[index] ~= emptyWatch and 1 or 0)
-        watches[index] = emptyWatch
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "RUN" then
-      server:send("200 OK\n")
-
-      local ev, vars, file, line, idx_watch = coroutine.yield()
-      eval_env = vars
-      if ev == events.BREAK then
-        server:send("202 Paused " .. file .. " " .. line .. "\n")
-      elseif ev == events.WATCH then
-        server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n")
-      elseif ev == events.RESTART then
-        -- nothing to do
-      else
-        server:send("401 Error in Execution " .. #file .. "\n")
-        server:send(file)
-      end
-    elseif command == "STEP" then
-      server:send("200 OK\n")
-      step_into = true
-
-      local ev, vars, file, line, idx_watch = coroutine.yield()
-      eval_env = vars
-      if ev == events.BREAK then
-        server:send("202 Paused " .. file .. " " .. line .. "\n")
-      elseif ev == events.WATCH then
-        server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n")
-      elseif ev == events.RESTART then
-        -- nothing to do
-      else
-        server:send("401 Error in Execution " .. #file .. "\n")
-        server:send(file)
-      end
-    elseif command == "OVER" or command == "OUT" then
-      server:send("200 OK\n")
-      step_over = true
-      
-      -- OVER and OUT are very similar except for 
-      -- the stack level value at which to stop
-      if command == "OUT" then step_level = stack_level - 1
-      else step_level = stack_level end
-
-      local ev, vars, file, line, idx_watch = coroutine.yield()
-      eval_env = vars
-      if ev == events.BREAK then
-        server:send("202 Paused " .. file .. " " .. line .. "\n")
-      elseif ev == events.WATCH then
-        server:send("203 Paused " .. file .. " " .. line .. " " .. idx_watch .. "\n")
-      elseif ev == events.RESTART then
-        -- nothing to do
-      else
-        server:send("401 Error in Execution " .. #file .. "\n")
-        server:send(file)
-      end
-    elseif command == "BASEDIR" then
-      local _, _, dir = string.find(line, "^[A-Z]+%s+(.+)%s*$")
-      if dir then
-        basedir = iscasepreserving and string.lower(dir) or dir
-        -- reset cached source as it may change with basedir
-        lastsource = nil
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "SUSPEND" then
-      -- do nothing; it already fulfilled its role
-    elseif command == "STACK" then
-      -- first check if we can execute the stack command
-      -- as it requires yielding back to debug_hook it cannot be executed
-      -- if we have not seen the hook yet as happens after start().
-      -- in this case we simply return an empty result
-      local vars, ev = {}
-      if seen_hook then
-        ev, vars = coroutine.yield("stack")
-      end
-      if ev and ev ~= events.STACK then
-        server:send("401 Error in Execution " .. #vars .. "\n")
-        server:send(vars)
-      else
-        local ok, res = pcall(serpent.dump, vars, {nocode = true, sparse = false})
-        if ok then
-          server:send("200 OK " .. res .. "\n")
-        else
-          server:send("401 Error in Execution " .. #res .. "\n")
-          server:send(res)
-        end
-      end
-    elseif command == "OUTPUT" then
-      local _, _, stream, mode = string.find(line, "^[A-Z]+%s+(%w+)%s+([dcr])%s*$")
-      if stream and mode and stream == "stdout" then
-        -- assign "print" in the global environment
-        genv.print = mode == 'd' and iobase.print or coroutine.wrap(function(...)
-          -- wrapping into coroutine.wrap protects this function from
-          -- being stepped through in the debugger
-          local tbl = {...}
-          while true do
-            if mode == 'c' then iobase.print(unpack(tbl)) end
-            for n = 1, #tbl do
-              tbl[n] = select(2, pcall(serpent.line, tbl[n], {nocode = true, comment = false})) end
-            local file = table.concat(tbl, "\t").."\n"
-            server:send("204 Output " .. stream .. " " .. #file .. "\n" .. file)
-            tbl = {coroutine.yield()}
-          end
-        end)
-        server:send("200 OK\n")
-      else
-        server:send("400 Bad Request\n")
-      end
-    elseif command == "EXIT" then
-      server:send("200 OK\n")
-      coroutine.yield("exit")
-    else
-      server:send("400 Bad Request\n")
-    end
-  end
-end
-
-local function connect(controller_host, controller_port)
-  return (socket.connect4 or socket.connect)(controller_host, controller_port)
-end
-
-local function isrunning()
-  return coro_debugger and coroutine.status(coro_debugger) == 'suspended'
-end
-
-local lasthost, lastport
-
--- Starts a debug session by connecting to a controller
-local function start(controller_host, controller_port)
-  -- only one debugging session can be run (as there is only one debug hook)
-  if isrunning() then return end
-
-  lasthost = controller_host or lasthost
-  lastport = controller_port or lastport
-
-  controller_host = lasthost or "localhost"
-  controller_port = lastport or mobdebug.port
-
-  local err
-  server, err = (socket.connect4 or socket.connect)(controller_host, controller_port)
-  if server then
-    -- correct stack depth which already has some calls on it
-    -- so it doesn't go into negative when those calls return
-    -- as this breaks subsequence checks in stack_depth().
-    -- start from 16th frame, which is sufficiently large for this check.
-    stack_level = stack_depth(16)
-
-    -- provide our own traceback function to report the error remotely
-    do
-      local dtraceback = debug.traceback
-      debug.traceback = function (...)
-        if select('#', ...) >= 1 then
-          local err, lvl = ...
-          if err and type(err) ~= 'thread' then
-            local trace = dtraceback(err, (lvl or 2)+1)
-            if genv.print == iobase.print then -- no remote redirect
-              return trace
-            else
-              genv.print(trace) -- report the error remotely
-              return -- don't report locally to avoid double reporting
-            end
-          end
-        end
-        -- direct call to debug.traceback: return the original.
-        -- debug.traceback(nil, level) doesn't work in Lua 5.1
-        -- (http://lua-users.org/lists/lua-l/2011-06/msg00574.html), so
-        -- simply remove first frame from the stack trace
-        return (dtraceback(...):gsub("(stack traceback:\n)[^\n]*\n", "%1"))
-      end
-    end
-    coro_debugger = coroutine.create(debugger_loop)
-    debug.sethook(debug_hook, "lcr")
-    seen_hook = nil -- reset in case the last start() call was refused
-    step_into = true -- start with step command
-    return true
-  else
-    print(("Could not connect to %s:%s: %s")
-      :format(controller_host, controller_port, err or "unknown error"))
-  end
-end
-
-local function controller(controller_host, controller_port, scratchpad)
-  -- only one debugging session can be run (as there is only one debug hook)
-  if isrunning() then return end
-
-  lasthost = controller_host or lasthost
-  lastport = controller_port or lastport
-
-  controller_host = lasthost or "localhost"
-  controller_port = lastport or mobdebug.port
-
-  local exitonerror = not scratchpad
-  local err
-  server, err = (socket.connect4 or socket.connect)(controller_host, controller_port)
-  if server then
-    local function report(trace, err)
-      local msg = err .. "\n" .. trace
-      server:send("401 Error in Execution " .. #msg .. "\n")
-      server:send(msg)
-      return err
-    end
-
-    seen_hook = true -- allow to accept all commands
-    coro_debugger = coroutine.create(debugger_loop)
-
-    while true do
-      step_into = true -- start with step command
-      abort = false -- reset abort flag from the previous loop
-      if scratchpad then checkcount = mobdebug.checkcount end -- force suspend right away
-
-      coro_debugee = coroutine.create(debugee)
-      debug.sethook(coro_debugee, debug_hook, "lcr")
-      local status, err = coroutine.resume(coro_debugee)
-
-      -- was there an error or is the script done?
-      -- 'abort' state is allowed here; ignore it
-      if abort then
-        if tostring(abort) == 'exit' then break end
-      else
-        if status then -- normal execution is done
-          break
-        elseif err and not tostring(err):find(deferror) then
-          -- report the error back
-          -- err is not necessarily a string, so convert to string to report
-          report(debug.traceback(coro_debugee), tostring(err))
-          if exitonerror then break end
-          -- resume once more to clear the response the debugger wants to send
-          -- need to use capture_vars(2) as three would be the level of
-          -- the caller for controller(), but because of the tail call,
-          -- the caller may not exist;
-          -- This is not entirely safe as the user may see the local
-          -- variable from console, but they will be reset anyway.
-          -- This functionality is used when scratchpad is paused to
-          -- gain access to remote console to modify global variables.
-          local status, err = coroutine.resume(coro_debugger, events.RESTART, capture_vars(2))
-          if not status or status and err == "exit" then break end
-        end
-      end
-    end
-  else
-    print(("Could not connect to %s:%s: %s")
-      :format(controller_host, controller_port, err or "unknown error"))
-    return false
-  end
-  return true
-end
-
-local function scratchpad(controller_host, controller_port)
-  return controller(controller_host, controller_port, true)
-end
-
-local function loop(controller_host, controller_port)
-  return controller(controller_host, controller_port, false)
-end
-
-local function on()
-  if not (isrunning() and server) then return end
-
-  -- main is set to true under Lua5.2 for the "main" chunk.
-  -- Lua5.1 returns co as `nil` in that case.
-  local co, main = coroutine.running()
-  if main then co = nil end
-  if co then
-    coroutines[co] = true
-    debug.sethook(co, debug_hook, "lcr")
-  else
-    if jit then coroutines.main = true end
-    debug.sethook(debug_hook, "lcr")
-  end
-end
-
-local function off()
-  if not (isrunning() and server) then return end
-
-  -- main is set to true under Lua5.2 for the "main" chunk.
-  -- Lua5.1 returns co as `nil` in that case.
-  local co, main = coroutine.running()
-  if main then co = nil end
-
-  -- don't remove coroutine hook under LuaJIT as there is only one (global) hook
-  if co then
-    coroutines[co] = false
-    if not jit then debug.sethook(co) end
-  else
-    if jit then coroutines.main = false end
-    if not jit then debug.sethook() end
-  end
-
-  -- check if there is any thread that is still being debugged under LuaJIT;
-  -- if not, turn the debugging off
-  if jit then
-    local remove = true
-    for co, debugged in pairs(coroutines) do
-      if debugged then remove = false; break end
-    end
-    if remove then debug.sethook() end
-  end
-end
-
--- Handles server debugging commands 
-local function handle(params, client, options)
-  local _, _, command = string.find(params, "^([a-z]+)")
-  local file, line, watch_idx
-  if command == "run" or command == "step" or command == "out"
-  or command == "over" or command == "exit" then
-    client:send(string.upper(command) .. "\n")
-    client:receive() -- this should consume the first '200 OK' response
-    while true do
-      local done = true
-      local breakpoint = client:receive()
-      if not breakpoint then
-        print("Program finished")
-        os.exit()
-        return -- use return here for those cases where os.exit() is not wanted
-      end
-      local _, _, status = string.find(breakpoint, "^(%d+)")
-      if status == "200" then
-        -- don't need to do anything
-      elseif status == "202" then
-        _, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$")
-        if file and line then
-          print("Paused at file " .. file .. " line " .. line)
-        end
-      elseif status == "203" then
-        _, _, file, line, watch_idx = string.find(breakpoint, "^203 Paused%s+(.-)%s+(%d+)%s+(%d+)%s*$")
-        if file and line and watch_idx then
-          print("Paused at file " .. file .. " line " .. line .. " (watch expression " .. watch_idx .. ": [" .. watches[watch_idx] .. "])")
-        end
-      elseif status == "204" then
-        local _, _, stream, size = string.find(breakpoint, "^204 Output (%w+) (%d+)$")
-        if stream and size then
-          local msg = client:receive(tonumber(size))
-          print(msg)
-          if outputs[stream] then outputs[stream](msg) end
-          -- this was just the output, so go back reading the response
-          done = false
-        end
-      elseif status == "401" then
-        local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)$")
-        if size then
-          local msg = client:receive(tonumber(size))
-          print("Error in remote application: " .. msg)
-          os.exit(1)
-          return nil, nil, msg -- use return here for those cases where os.exit() is not wanted
-        end
-      else
-        print("Unknown error")
-        os.exit(1)
-        -- use return here for those cases where os.exit() is not wanted
-        return nil, nil, "Debugger error: unexpected response '" .. breakpoint .. "'"
-      end
-      if done then break end
-    end
-  elseif command == "setb" then
-    _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$")
-    if file and line then
-      -- if this is a file name, and not a file source
-      if not file:find('^".*"$') then
-        file = string.gsub(file, "\\", "/") -- convert slash
-        file = removebasedir(file, basedir)
-      end
-      client:send("SETB " .. file .. " " .. line .. "\n")
-      if client:receive() == "200 OK" then
-        set_breakpoint(file, line)
-      else
-        print("Error: breakpoint not inserted")
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "setw" then
-    local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$")
-    if exp then
-      client:send("SETW " .. exp .. "\n")
-      local answer = client:receive()
-      local _, _, watch_idx = string.find(answer, "^200 OK (%d+)%s*$")
-      if watch_idx then
-        watches[watch_idx] = exp
-        print("Inserted watch exp no. " .. watch_idx)
-      else
-        local _, _, size = string.find(answer, "^401 Error in Expression (%d+)$")
-        if size then
-          local err = client:receive(tonumber(size)):gsub(".-:%d+:%s*","")
-          print("Error: watch expression not set: " .. err)
-        else
-          print("Error: watch expression not set")
-        end
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "delb" then
-    _, _, _, file, line = string.find(params, "^([a-z]+)%s+(.-)%s+(%d+)%s*$")
-    if file and line then
-      -- if this is a file name, and not a file source
-      if not file:find('^".*"$') then
-        file = string.gsub(file, "\\", "/") -- convert slash
-        file = removebasedir(file, basedir)
-      end
-      client:send("DELB " .. file .. " " .. line .. "\n")
-      if client:receive() == "200 OK" then 
-        remove_breakpoint(file, line)
-      else
-        print("Error: breakpoint not removed")
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "delallb" then
-    for line, breaks in pairs(breakpoints) do
-      for file, _ in pairs(breaks) do
-        client:send("DELB " .. file .. " " .. line .. "\n")
-        if client:receive() == "200 OK" then
-          remove_breakpoint(file, line)
-        else
-          print("Error: breakpoint at file " .. file .. " line " .. line .. " not removed")
-        end
-      end
-    end
-  elseif command == "delw" then
-    local _, _, index = string.find(params, "^[a-z]+%s+(%d+)%s*$")
-    if index then
-      client:send("DELW " .. index .. "\n")
-      if client:receive() == "200 OK" then 
-        watches[index] = nil
-      else
-        print("Error: watch expression not removed")
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "delallw" then
-    for index, exp in pairs(watches) do
-      client:send("DELW " .. index .. "\n")
-      if client:receive() == "200 OK" then 
-        watches[index] = nil
-      else
-        print("Error: watch expression at index " .. index .. " [" .. exp .. "] not removed")
-      end
-    end    
-  elseif command == "eval" or command == "exec" 
-      or command == "load" or command == "loadstring"
-      or command == "reload" then
-    local _, _, exp = string.find(params, "^[a-z]+%s+(.+)$")
-    if exp or (command == "reload") then 
-      if command == "eval" or command == "exec" then
-        exp = (exp:gsub("%-%-%[(=*)%[.-%]%1%]", "") -- remove comments
-                  :gsub("%-%-.-\n", " ") -- remove line comments
-                  :gsub("\n", " ")) -- convert new lines
-        if command == "eval" then exp = "return " .. exp end
-        client:send("EXEC " .. exp .. "\n")
-      elseif command == "reload" then
-        client:send("LOAD 0 -\n")
-      elseif command == "loadstring" then
-        local _, _, _, file, lines = string.find(exp, "^([\"'])(.-)%1%s+(.+)")
-        if not file then
-           _, _, file, lines = string.find(exp, "^(%S+)%s+(.+)")
-        end
-        client:send("LOAD " .. #lines .. " " .. file .. "\n")
-        client:send(lines)
-      else
-        local file = io.open(exp, "r")
-        if not file and pcall(require, "winapi") then
-          -- if file is not open and winapi is there, try with a short path;
-          -- this may be needed for unicode paths on windows
-          winapi.set_encoding(winapi.CP_UTF8)
-          file = io.open(winapi.short_path(exp), "r")
-        end
-        if not file then error("Cannot open file " .. exp) end
-        -- read the file and remove the shebang line as it causes a compilation error
-        local lines = file:read("*all"):gsub("^#!.-\n", "\n")
-        file:close()
-
-        local file = string.gsub(exp, "\\", "/") -- convert slash
-        file = removebasedir(file, basedir)
-        client:send("LOAD " .. #lines .. " " .. file .. "\n")
-        if #lines > 0 then client:send(lines) end
-      end
-      while true do
-        local params, err = client:receive()
-        if not params then
-          return nil, nil, "Debugger connection " .. (err or "error")
-        end
-        local done = true
-        local _, _, status, len = string.find(params, "^(%d+).-%s+(%d+)%s*$")
-        if status == "200" then
-          len = tonumber(len)
-          if len > 0 then
-            local status, res
-            local str = client:receive(len)
-            -- handle serialized table with results
-            local func, err = loadstring(str)
-            if func then
-              status, res = pcall(func)
-              if not status then err = res
-              elseif type(res) ~= "table" then
-                err = "received "..type(res).." instead of expected 'table'"
-              end
-            end
-            if err then
-              print("Error in processing results: " .. err)
-              return nil, nil, "Error in processing results: " .. err
-            end
-            print(unpack(res))
-            return res[1], res
-          end
-        elseif status == "201" then
-          _, _, file, line = string.find(params, "^201 Started%s+(.-)%s+(%d+)%s*$")
-        elseif status == "202" or params == "200 OK" then
-          -- do nothing; this only happens when RE/LOAD command gets the response
-          -- that was for the original command that was aborted
-        elseif status == "204" then
-          local _, _, stream, size = string.find(params, "^204 Output (%w+) (%d+)$")
-          if stream and size then
-            local msg = client:receive(tonumber(size))
-            print(msg)
-            if outputs[stream] then outputs[stream](msg) end
-            -- this was just the output, so go back reading the response
-            done = false
-          end
-        elseif status == "401" then
-          len = tonumber(len)
-          local res = client:receive(len)
-          print("Error in expression: " .. res)
-          return nil, nil, res
-        else
-          print("Unknown error")
-          return nil, nil, "Debugger error: unexpected response after EXEC/LOAD '" .. params .. "'"
-        end
-        if done then break end
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "listb" then
-    for l, v in pairs(breakpoints) do
-      for f in pairs(v) do
-        print(f .. ": " .. l)
-      end
-    end
-  elseif command == "listw" then
-    for i, v in pairs(watches) do
-      print("Watch exp. " .. i .. ": " .. v)
-    end    
-  elseif command == "suspend" then
-    client:send("SUSPEND\n")
-  elseif command == "stack" then
-    client:send("STACK\n")
-    local resp = client:receive()
-    local _, _, status, res = string.find(resp, "^(%d+)%s+%w+%s+(.+)%s*$")
-    if status == "200" then
-      local func, err = loadstring(res)
-      if func == nil then
-        print("Error in stack information: " .. err)
-        return nil, nil, err
-      end
-      local ok, stack = pcall(func)
-      if not ok then
-        print("Error in stack information: " .. stack)
-        return nil, nil, stack
-      end
-      for _,frame in ipairs(stack) do
-        print(serpent.line(frame[1], {comment = false}))
-      end
-      return stack
-    elseif status == "401" then
-      local _, _, len = string.find(resp, "%s+(%d+)%s*$")
-      len = tonumber(len)
-      local res = len > 0 and client:receive(len) or "Invalid stack information."
-      print("Error in expression: " .. res)
-      return nil, nil, res
-    else
-      print("Unknown error")
-      return nil, nil, "Debugger error: unexpected response after STACK"
-    end
-  elseif command == "output" then
-    local _, _, stream, mode = string.find(params, "^[a-z]+%s+(%w+)%s+([dcr])%s*$")
-    if stream and mode then
-      client:send("OUTPUT "..stream.." "..mode.."\n")
-      local resp = client:receive()
-      local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$")
-      if status == "200" then
-        print("Stream "..stream.." redirected")
-        outputs[stream] = type(options) == 'table' and options.handler or nil
-      else
-        print("Unknown error")
-        return nil, nil, "Debugger error: can't redirect "..stream
-      end
-    else
-      print("Invalid command")
-    end
-  elseif command == "basedir" then
-    local _, _, dir = string.find(params, "^[a-z]+%s+(.+)$")
-    if dir then
-      dir = string.gsub(dir, "\\", "/") -- convert slash
-      if not string.find(dir, "/$") then dir = dir .. "/" end
-
-      local remdir = dir:match("\t(.+)")
-      if remdir then dir = dir:gsub("/?\t.+", "/") end
-      basedir = dir
-
-      client:send("BASEDIR "..(remdir or dir).."\n")
-      local resp = client:receive()
-      local _, _, status = string.find(resp, "^(%d+)%s+%w+%s*$")
-      if status == "200" then
-        print("New base directory is " .. basedir)
-      else
-        print("Unknown error")
-        return nil, nil, "Debugger error: unexpected response after BASEDIR"
-      end
-    else
-      print(basedir)
-    end
-  elseif command == "help" then
-    print("setb <file> <line>    -- sets a breakpoint")
-    print("delb <file> <line>    -- removes a breakpoint")
-    print("delallb               -- removes all breakpoints")
-    print("setw <exp>            -- adds a new watch expression")
-    print("delw <index>          -- removes the watch expression at index")
-    print("delallw               -- removes all watch expressions")
-    print("run                   -- runs until next breakpoint")
-    print("step                  -- runs until next line, stepping into function calls")
-    print("over                  -- runs until next line, stepping over function calls")
-    print("out                   -- runs until line after returning from current function")
-    print("listb                 -- lists breakpoints")
-    print("listw                 -- lists watch expressions")
-    print("eval <exp>            -- evaluates expression on the current context and returns its value")
-    print("exec <stmt>           -- executes statement on the current context")
-    print("load <file>           -- loads a local file for debugging")
-    print("reload                -- restarts the current debugging session")
-    print("stack                 -- reports stack trace")
-    print("output stdout <d|c|r> -- capture and redirect io stream (default|copy|redirect)")
-    print("basedir [<path>]      -- sets the base path of the remote application, or shows the current one")
-    print("exit                  -- exits debugger")
-  else
-    local _, _, spaces = string.find(params, "^(%s*)$")
-    if not spaces then
-      print("Invalid command")
-      return nil, nil, "Invalid command"
-    end
-  end
-  return file, line
-end
-
--- Starts debugging server
-local function listen(host, port)
-  host = host or "*"
-  port = port or mobdebug.port
-
-  local socket = require "socket"
-
-  print("Lua Remote Debugger")
-  print("Run the program you wish to debug")
-
-  local server = socket.bind(host, port)
-  local client = server:accept()
-
-  client:send("STEP\n")
-  client:receive()
-
-  local breakpoint = client:receive()
-  local _, _, file, line = string.find(breakpoint, "^202 Paused%s+(.-)%s+(%d+)%s*$")
-  if file and line then
-    print("Paused at file " .. file )
-    print("Type 'help' for commands")
-  else
-    local _, _, size = string.find(breakpoint, "^401 Error in Execution (%d+)%s*$")
-    if size then
-      print("Error in remote application: ")
-      print(client:receive(size))
-    end
-  end
-
-  while true do
-    io.write("> ")
-    local line = io.read("*line")
-    handle(line, client)
-  end
-end
-
-local cocreate
-local function coro()
-  if cocreate then return end -- only set once
-  cocreate = cocreate or coroutine.create
-  coroutine.create = function(f, ...)
-    return cocreate(function(...)
-      require("mobdebug").on()
-      return f(...)
-    end, ...)
-  end
-end
-
-local moconew
-local function moai()
-  if moconew then return end -- only set once
-  moconew = moconew or (MOAICoroutine and MOAICoroutine.new)
-  if not moconew then return end
-  MOAICoroutine.new = function(...)
-    local thread = moconew(...)
-    -- need to support both thread.run and getmetatable(thread).run, which
-    -- was used in earlier MOAI versions
-    local mt = thread.run and thread or getmetatable(thread)
-    local patched = mt.run
-    mt.run = function(self, f, ...)
-      return patched(self,  function(...)
-        require("mobdebug").on()
-        return f(...)
-      end, ...)
-    end
-    return thread
-  end
-end
-
--- this is a function that removes all hooks and closes the socket to
--- report back to the controller that the debugging is done.
--- the script that called `done` can still continue.
-local function done()
-  if not (isrunning() and server) then return end
-
-  if not jit then
-    for co, debugged in pairs(coroutines) do
-      if debugged then debug.sethook(co) end
-    end
-  end
-
-  debug.sethook()
-  server:close()
-
-  coro_debugger = nil -- to make sure isrunning() returns `false`
-  seen_hook = nil -- to make sure that the next start() call works
-  abort = nil -- to make sure that callback calls use proper "abort" value
-end
-
--- make public functions available
-mobdebug.listen = listen
-mobdebug.loop = loop
-mobdebug.scratchpad = scratchpad
-mobdebug.handle = handle
-mobdebug.connect = connect
-mobdebug.start = start
-mobdebug.on = on
-mobdebug.off = off
-mobdebug.moai = moai
-mobdebug.coro = coro
-mobdebug.done = done
-mobdebug.line = serpent.line
-mobdebug.dump = serpent.dump
-mobdebug.yield = nil -- callback
-
--- this is needed to make "require 'modebug'" to work when mobdebug
--- module is loaded manually
-package.loaded.mobdebug = mobdebug
-
-return mobdebug
diff --git a/samples/Lua/HelloLua/proj.android/.classpath b/samples/Lua/HelloLua/proj.android/.classpath
deleted file mode 100644
index 0b08408342..0000000000
--- a/samples/Lua/HelloLua/proj.android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/samples/Lua/HelloLua/proj.android/.externalToolBuilders/Javah_jni_builder.launch b/samples/Lua/HelloLua/proj.android/.externalToolBuilders/Javah_jni_builder.launch
deleted file mode 100644
index 3506e4e944..0000000000
--- a/samples/Lua/HelloLua/proj.android/.externalToolBuilders/Javah_jni_builder.launch
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/MyProject/jni&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/javah"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-verbose&#10;-d jni&#10;-classpath ${project_loc}/bin/classes&#10;com.myproject.MyActivity"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${project_loc}"/>
-</launchConfiguration>
diff --git a/samples/Lua/HelloLua/proj.android/.settings/org.eclipse.cdt.codan.core.prefs b/samples/Lua/HelloLua/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index bad4196993..0000000000
--- a/samples/Lua/HelloLua/proj.android/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=-Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=-Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.checkers.noreturn=-Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=-Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=-Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
-useParentScope=false
diff --git a/samples/Lua/HelloLua/proj.android/AndroidManifest.xml b/samples/Lua/HelloLua/proj.android/AndroidManifest.xml
deleted file mode 100644
index 0703d5285d..0000000000
--- a/samples/Lua/HelloLua/proj.android/AndroidManifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.cocos2dx.hellolua"
-      android:versionCode="1"
-      android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="9"/>
-    <uses-feature android:glEsVersion="0x00020000" />
-
-    <application android:label="@string/app_name"
-                 android:icon="@drawable/icon">
-
-        <activity android:name=".Cocos2dxActivity"
-                  android:label="@string/app_name"
-                  android:screenOrientation="landscape"
-                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                  android:configChanges="orientation">
-
-            <!-- Tell NativeActivity the name of our .so -->
-            <meta-data android:name="android.app.lib_name"
-                       android:value="hellolua" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <supports-screens android:anyDensity="true"
-                      android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:xlargeScreens="true"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest> 
diff --git a/samples/Lua/HelloLua/proj.android/ant.properties b/samples/Lua/HelloLua/proj.android/ant.properties
deleted file mode 100644
index b0971e891e..0000000000
--- a/samples/Lua/HelloLua/proj.android/ant.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
diff --git a/samples/Lua/HelloLua/proj.android/build.xml b/samples/Lua/HelloLua/proj.android/build.xml
deleted file mode 100644
index ff293087f2..0000000000
--- a/samples/Lua/HelloLua/proj.android/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="HelloLua" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/samples/Lua/HelloLua/proj.android/jni/Android.mk b/samples/Lua/HelloLua/proj.android/jni/Android.mk
deleted file mode 100644
index 2c3b9124cf..0000000000
--- a/samples/Lua/HelloLua/proj.android/jni/Android.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := hellolua_shared
-
-LOCAL_MODULE_FILENAME := libhellolua
-
-LOCAL_SRC_FILES := hellolua/main.cpp \
-                   ../../Classes/AppDelegate.cpp
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \
-                    $(LOCAL_PATH)/../../../../../external/lua/tolua \
-
-LOCAL_WHOLE_STATIC_LIBRARIES := cocos_lua_static
-
-
-include $(BUILD_SHARED_LIBRARY)
-
-$(call import-module,scripting/lua/bindings)
diff --git a/samples/Lua/HelloLua/proj.android/jni/Application.mk b/samples/Lua/HelloLua/proj.android/jni/Application.mk
deleted file mode 100644
index 540e49c358..0000000000
--- a/samples/Lua/HelloLua/proj.android/jni/Application.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-APP_STL := gnustl_static
-
-# add -Wno-literal-suffix to avoid warning: warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix] 
-# in NDK_ROOT/arch-arm/usr/include/sys/cdefs_elf.h:35:28: when using ndk-r9
-APP_CPPFLAGS := -frtti -DCOCOS2D_DEBUG=1 -std=c++11 -Wno-literal-suffix -fsigned-char
-
-APP_CPPFLAGS += -fexceptions 
-
diff --git a/samples/Lua/HelloLua/proj.android/jni/hellolua/main.cpp b/samples/Lua/HelloLua/proj.android/jni/hellolua/main.cpp
deleted file mode 100644
index 20e2ea1f45..0000000000
--- a/samples/Lua/HelloLua/proj.android/jni/hellolua/main.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "AppDelegate.h"
-#include "cocos2d.h"
-#include "platform/android/jni/JniHelper.h"
-#include <jni.h>
-#include <android/log.h>
-
-#define  LOG_TAG    "main"
-#define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
-
-using namespace cocos2d;
-
-void cocos_android_app_init (struct android_app* app) {
-    LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
-}
diff --git a/samples/Lua/HelloLua/proj.android/proguard-project.txt b/samples/Lua/HelloLua/proj.android/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/samples/Lua/HelloLua/proj.android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/samples/Lua/HelloLua/proj.android/project.properties b/samples/Lua/HelloLua/proj.android/project.properties
deleted file mode 100644
index 0a6dc6664d..0000000000
--- a/samples/Lua/HelloLua/proj.android/project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-10
-
-android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Lua/HelloLua/proj.android/res/values/strings.xml b/samples/Lua/HelloLua/proj.android/res/values/strings.xml
deleted file mode 100644
index d2c2ebdfb1..0000000000
--- a/samples/Lua/HelloLua/proj.android/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">HelloLua</string>
-</resources>
diff --git a/samples/Lua/HelloLua/proj.android/src/org/cocos2dx/hellolua/Cocos2dxActivity.java b/samples/Lua/HelloLua/proj.android/src/org/cocos2dx/hellolua/Cocos2dxActivity.java
deleted file mode 100644
index 9933cf14fd..0000000000
--- a/samples/Lua/HelloLua/proj.android/src/org/cocos2dx/hellolua/Cocos2dxActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.cocos2dx.hellolua;
-
-import android.app.NativeActivity;
-import android.graphics.PixelFormat;
-import android.os.Bundle;
-
-public class Cocos2dxActivity extends NativeActivity {
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		// TODO Auto-generated method stub
-		super.onCreate(savedInstanceState);
-		
-		//For supports translucency
-		
-		//1.change "attribs" in cocos\2d\platform\android\nativeactivity.cpp
-		/*const EGLint attribs[] = {
-	            EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-	            EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,  
-	            //EGL_BLUE_SIZE, 5,   -->delete 
-	            //EGL_GREEN_SIZE, 6,  -->delete 
-	            //EGL_RED_SIZE, 5,    -->delete 
-	            EGL_BUFFER_SIZE, 32,  //-->new field
-	            EGL_DEPTH_SIZE, 16,
-	            EGL_STENCIL_SIZE, 8,
-	            EGL_NONE
-	    };*/
-		
-		//2.Set the format of window
-		// getWindow().setFormat(PixelFormat.TRANSLUCENT);
-		
-	}
-}
diff --git a/samples/Lua/HelloLua/proj.ios/AppController.h b/samples/Lua/HelloLua/proj.ios/AppController.h
deleted file mode 100644
index 3d51064ca0..0000000000
--- a/samples/Lua/HelloLua/proj.ios/AppController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010 cocos2d-x.org
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-@class RootViewController;
-
-@interface AppController : NSObject <UIAccelerometerDelegate, UIAlertViewDelegate, UITextFieldDelegate,UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
-}
-
-@end
-
diff --git a/samples/Lua/HelloLua/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Lua/HelloLua/proj.ios/Default-568h@2x.png.REMOVED.git-id
deleted file mode 100644
index 8f5838f3a8..0000000000
--- a/samples/Lua/HelloLua/proj.ios/Default-568h@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-66c6d1cead373b45218424f6a82f370897e443e4
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Lua/HelloLua/proj.ios/Default@2x.png.REMOVED.git-id
deleted file mode 100644
index 8843505b20..0000000000
--- a/samples/Lua/HelloLua/proj.ios/Default@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-84689888a14a2123d2b39f7f2f61be8c15207479
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/proj.ios/HelloLua_Prefix.pch b/samples/Lua/HelloLua/proj.ios/HelloLua_Prefix.pch
deleted file mode 100644
index b4311a0a3d..0000000000
--- a/samples/Lua/HelloLua/proj.ios/HelloLua_Prefix.pch
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// Prefix header for all source files of the 'HelloLua' target in the 'HelloLua' project
-//
-
-#ifdef __OBJC__
-	#import <Foundation/Foundation.h>
-	#import <UIKit/UIKit.h>
-#endif
diff --git a/samples/Lua/HelloLua/proj.ios/RootViewController.h b/samples/Lua/HelloLua/proj.ios/RootViewController.h
deleted file mode 100644
index 11dfc4bf88..0000000000
--- a/samples/Lua/HelloLua/proj.ios/RootViewController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-
-@interface RootViewController : UIViewController {
-
-}
-- (BOOL)prefersStatusBarHidden;
-@end
diff --git a/samples/Lua/HelloLua/proj.ios/RootViewController.mm b/samples/Lua/HelloLua/proj.ios/RootViewController.mm
deleted file mode 100644
index a00da00584..0000000000
--- a/samples/Lua/HelloLua/proj.ios/RootViewController.mm
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import "RootViewController.h"
-
-
-@implementation RootViewController
-
-/*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-/*
-// Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
-}
-*/
-
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
- 
-*/
-// Override to allow orientations other than the default portrait orientation.
-// This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
-}
-
-// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
-#ifdef __IPHONE_6_0
-    return UIInterfaceOrientationMaskAllButUpsideDown;
-#endif
-}
-
-- (BOOL) shouldAutorotate {
-    return YES;
-}
-
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end
diff --git a/samples/Lua/HelloLua/proj.ios/main.m b/samples/Lua/HelloLua/proj.ios/main.m
deleted file mode 100644
index 27ca9796f7..0000000000
--- a/samples/Lua/HelloLua/proj.ios/main.m
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-//  main.m
-//  HelloLua
-//
-//  Created by Walzer on 11-6-15.
-//  Copyright __MyCompanyName__ 2011. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppController");
-    [pool release];
-    return retVal;
-}
diff --git a/samples/Lua/HelloLua/proj.linux/main.cpp b/samples/Lua/HelloLua/proj.linux/main.cpp
deleted file mode 100644
index fee36d74ed..0000000000
--- a/samples/Lua/HelloLua/proj.linux/main.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "../Classes/AppDelegate.h"
-#include "cocos2d.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string>
-
-USING_NS_CC;
-
-int main(int argc, char **argv)
-{
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("HelloLua",900,640);
-    return Application::getInstance()->run();
-}
diff --git a/samples/Lua/HelloLua/proj.mac/HelloLua_Prefix.pch b/samples/Lua/HelloLua/proj.mac/HelloLua_Prefix.pch
deleted file mode 100644
index 46c36a7e99..0000000000
--- a/samples/Lua/HelloLua/proj.mac/HelloLua_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'Paralaxer' target in the 'Paralaxer' project
-//
-
-#ifdef __OBJC__
-	#import <Cocoa/Cocoa.h>
-#endif
diff --git a/samples/Lua/HelloLua/proj.mac/Icon.icns.REMOVED.git-id b/samples/Lua/HelloLua/proj.mac/Icon.icns.REMOVED.git-id
deleted file mode 100644
index 9874ec6979..0000000000
--- a/samples/Lua/HelloLua/proj.mac/Icon.icns.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/proj.mac/en.lproj/InfoPlist.strings b/samples/Lua/HelloLua/proj.mac/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/samples/Lua/HelloLua/proj.mac/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/samples/Lua/HelloLua/proj.mac/en.lproj/MainMenu.xib b/samples/Lua/HelloLua/proj.mac/en.lproj/MainMenu.xib
deleted file mode 100644
index 9f99439250..0000000000
--- a/samples/Lua/HelloLua/proj.mac/en.lproj/MainMenu.xib
+++ /dev/null
@@ -1,812 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSMenuItem</string>
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">HelloCpp</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">HelloCpp</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About HelloCpp</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="609285721">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Preferences…</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="481834944">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-										</object>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide HelloCpp</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit HelloCpp</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="204933491">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Toggle Fullscreen</string>
-									<string key="NSKeyEquiv">f</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="448692316">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="992780483">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="105068016">
-									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">HelloCpp Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">495</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="105068016"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFullScreen:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="204933491"/>
-					</object>
-					<int key="connectionID">537</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713487014"/>
-							<reference ref="694149608"/>
-							<reference ref="586577488"/>
-							<reference ref="448692316"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="835318025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110575045"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="609285721"/>
-							<reference ref="481834944"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-						</object>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="609285721"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="481834944"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752062318"/>
-						</object>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="299356726"/>
-							<reference ref="625202149"/>
-							<reference ref="575023229"/>
-							<reference ref="1011231497"/>
-						</object>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="466310130"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="204933491"/>
-						</object>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="448692316"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="992780483"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="992780483"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="105068016"/>
-						</object>
-						<reference key="parent" ref="448692316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="105068016"/>
-						<reference key="parent" ref="992780483"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">536</int>
-						<reference key="object" ref="204933491"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>129.IBPluginDependency</string>
-					<string>130.IBPluginDependency</string>
-					<string>131.IBPluginDependency</string>
-					<string>134.IBPluginDependency</string>
-					<string>136.IBPluginDependency</string>
-					<string>143.IBPluginDependency</string>
-					<string>144.IBPluginDependency</string>
-					<string>145.IBPluginDependency</string>
-					<string>149.IBPluginDependency</string>
-					<string>150.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>23.IBPluginDependency</string>
-					<string>236.IBPluginDependency</string>
-					<string>239.IBPluginDependency</string>
-					<string>24.IBPluginDependency</string>
-					<string>29.IBPluginDependency</string>
-					<string>295.IBPluginDependency</string>
-					<string>296.IBPluginDependency</string>
-					<string>420.IBPluginDependency</string>
-					<string>490.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>492.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>536.IBPluginDependency</string>
-					<string>56.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>92.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">541</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">exitFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>EAGLView</string>
-							<string>Window</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">glView</string>
-								<string key="candidateClassName">EAGLView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">window</string>
-								<string key="candidateClassName">Window</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">EAGLView</string>
-					<string key="superclassName">NSOpenGLView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/EAGLView.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-			</object>
-		</object>
-	</data>
-</archive>
diff --git a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj b/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
deleted file mode 100644
index 6ed5cb8431..0000000000
--- a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{13E55395-94A2-4CD9-BFC2-1A051F80C17D}</ProjectGuid>
-    <RootNamespace>HelloLua.win32</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
-    <PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v110_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration).win32\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration).win32\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)HelloLua.tlb</TypeLibraryName>
-      <HeaderFileName>HelloLua.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>HelloLua_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>HelloLua_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\scripting\lua\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <PreBuildEvent>
-      <Command>xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua\script" "$(ProjectDir)..\..\HelloLua\Resources" /e /Y</Command>
-    </PreBuildEvent>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>false</MkTypLibCompatible>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <GenerateStublessProxies>true</GenerateStublessProxies>
-      <TypeLibraryName>$(IntDir)HelloLua.tlb</TypeLibraryName>
-      <HeaderFileName>HelloLua.h</HeaderFileName>
-      <DllDataFileName>
-      </DllDataFileName>
-      <InterfaceIdentifierFileName>HelloLua_i.c</InterfaceIdentifierFileName>
-      <ProxyFileName>HelloLua_p.c</ProxyFileName>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(EngineRoot)cocos\scripting\auto-generated\lua-bindings;$(EngineRoot)cocos\scripting\lua\bindings;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>
-      </ExceptionHandling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <DisableSpecificWarnings>4267;4251;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-      <AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>libcurl_imp.lib;lua51.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <PreLinkEvent>
-      <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
-</Command>
-    </PreLinkEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Classes\AppDelegate.cpp" />
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Classes\AppDelegate.h" />
-    <ClInclude Include="main.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
-      <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
-      <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
-      <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
-      <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
-      <Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
-      <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
-      <Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\lua\bindings\liblua.vcxproj">
-      <Project>{ddc3e27f-004d-4dd4-9dd3-931a013d2159}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
-      <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
-      <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
-      <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.filters b/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.filters
deleted file mode 100644
index 5de7838f8f..0000000000
--- a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Classes">
-      <UniqueIdentifier>{83371666-be62-4e91-b8cc-395730853621}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="win32">
-      <UniqueIdentifier>{917fb40f-fc6d-4ee9-9a20-26debabe41aa}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Classes\AppDelegate.cpp">
-      <Filter>Classes</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>win32</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Classes\AppDelegate.h">
-      <Filter>Classes</Filter>
-    </ClInclude>
-    <ClInclude Include="main.h">
-      <Filter>win32</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.user b/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.user
deleted file mode 100644
index 32a6296820..0000000000
--- a/samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj.user
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>$(ProjectDir)..\Resources</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/samples/Lua/HelloLua/proj.win32/main.cpp b/samples/Lua/HelloLua/proj.win32/main.cpp
deleted file mode 100644
index b07e50bc66..0000000000
--- a/samples/Lua/HelloLua/proj.win32/main.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "main.h"
-#include "AppDelegate.h"
-#include "CCEGLView.h"
-
-USING_NS_CC;
-
-// uncomment below line, open debug console
-#define USE_WIN32_CONSOLE
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
-                       HINSTANCE hPrevInstance,
-                       LPTSTR    lpCmdLine,
-                       int       nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-
-#ifdef USE_WIN32_CONSOLE
-    AllocConsole();
-    freopen("CONIN$", "r", stdin);
-    freopen("CONOUT$", "w", stdout);
-    freopen("CONOUT$", "w", stderr);
-#endif
-
-    // create the application instance
-    AppDelegate app;
-    EGLView eglView;
-    eglView.init("HelloLua",900,640);
-    
-    int ret = Application::getInstance()->run();
-
-#ifdef USE_WIN32_CONSOLE
-    FreeConsole();
-#endif
-
-    return ret;
-}
diff --git a/samples/Lua/HelloLua/proj.win32/main.h b/samples/Lua/HelloLua/proj.win32/main.h
deleted file mode 100644
index e74708bdf2..0000000000
--- a/samples/Lua/HelloLua/proj.win32/main.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __MAIN_H__
-#define __MAIN_H__
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-
-// Windows Header Files:
-#include <windows.h>
-#include <tchar.h>
-
-// C RunTime Header Files
-#include "CCStdC.h"
-
-#endif    // __MAIN_H__
diff --git a/samples/Lua/TestLua/proj.android/.classpath b/samples/Lua/TestLua/proj.android/.classpath
deleted file mode 100644
index 0b08408342..0000000000
--- a/samples/Lua/TestLua/proj.android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/samples/Lua/TestLua/proj.android/ant.properties b/samples/Lua/TestLua/proj.android/ant.properties
deleted file mode 100644
index b0971e891e..0000000000
--- a/samples/Lua/TestLua/proj.android/ant.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
diff --git a/samples/Lua/TestLua/proj.android/proguard-project.txt b/samples/Lua/TestLua/proj.android/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/samples/Lua/TestLua/proj.android/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/samples/Lua/TestLua/proj.android/project.properties b/samples/Lua/TestLua/proj.android/project.properties
deleted file mode 100644
index 0a6dc6664d..0000000000
--- a/samples/Lua/TestLua/proj.android/project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-10
-
-android.library.reference.1=../../../../cocos/2d/platform/android/java
diff --git a/samples/Lua/TestLua/proj.ios/AppController.h b/samples/Lua/TestLua/proj.ios/AppController.h
deleted file mode 100644
index 3d51064ca0..0000000000
--- a/samples/Lua/TestLua/proj.ios/AppController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010 cocos2d-x.org
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-@class RootViewController;
-
-@interface AppController : NSObject <UIAccelerometerDelegate, UIAlertViewDelegate, UITextFieldDelegate,UIApplicationDelegate> {
-    UIWindow *window;
-    RootViewController    *viewController;
-}
-
-@end
-
diff --git a/samples/Lua/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/Lua/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id
deleted file mode 100644
index 8f5838f3a8..0000000000
--- a/samples/Lua/TestLua/proj.ios/Default-568h@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-66c6d1cead373b45218424f6a82f370897e443e4
\ No newline at end of file
diff --git a/samples/Lua/TestLua/proj.ios/Default@2x.png.REMOVED.git-id b/samples/Lua/TestLua/proj.ios/Default@2x.png.REMOVED.git-id
deleted file mode 100644
index 8843505b20..0000000000
--- a/samples/Lua/TestLua/proj.ios/Default@2x.png.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-84689888a14a2123d2b39f7f2f61be8c15207479
\ No newline at end of file
diff --git a/samples/Lua/TestLua/proj.ios/RootViewController.h b/samples/Lua/TestLua/proj.ios/RootViewController.h
deleted file mode 100644
index 11dfc4bf88..0000000000
--- a/samples/Lua/TestLua/proj.ios/RootViewController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import <UIKit/UIKit.h>
-
-
-@interface RootViewController : UIViewController {
-
-}
-- (BOOL)prefersStatusBarHidden;
-@end
diff --git a/samples/Lua/TestLua/proj.ios/RootViewController.mm b/samples/Lua/TestLua/proj.ios/RootViewController.mm
deleted file mode 100644
index a00da00584..0000000000
--- a/samples/Lua/TestLua/proj.ios/RootViewController.mm
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
- Copyright (c) 2010-2011 cocos2d-x.org
- Copyright (c) 2010      Ricardo Quesada
- 
- http://www.cocos2d-x.org
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
- ****************************************************************************/
-
-#import "RootViewController.h"
-
-
-@implementation RootViewController
-
-/*
- // The designated initializer.  Override if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad.
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
-    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
-        // Custom initialization
-    }
-    return self;
-}
-*/
-
-/*
-// Implement loadView to create a view hierarchy programmatically, without using a nib.
-- (void)loadView {
-}
-*/
-
-/*
-// Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
-- (void)viewDidLoad {
-    [super viewDidLoad];
-}
- 
-*/
-// Override to allow orientations other than the default portrait orientation.
-// This method is deprecated on ios6
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    return UIInterfaceOrientationIsLandscape( interfaceOrientation );
-}
-
-// For ios6, use supportedInterfaceOrientations & shouldAutorotate instead
-- (NSUInteger) supportedInterfaceOrientations{
-#ifdef __IPHONE_6_0
-    return UIInterfaceOrientationMaskAllButUpsideDown;
-#endif
-}
-
-- (BOOL) shouldAutorotate {
-    return YES;
-}
-
-//fix not hide status on ios7
-- (BOOL)prefersStatusBarHidden
-{
-    return YES;
-}
-
-- (void)didReceiveMemoryWarning {
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-- (void)viewDidUnload {
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
-    [super dealloc];
-}
-
-
-@end
diff --git a/samples/Lua/TestLua/proj.mac/Icon.icns.REMOVED.git-id b/samples/Lua/TestLua/proj.mac/Icon.icns.REMOVED.git-id
deleted file mode 100644
index 9874ec6979..0000000000
--- a/samples/Lua/TestLua/proj.mac/Icon.icns.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-3d09e8fb4f4ca1c1ae7ab0a6948db592c7c3d9a0
\ No newline at end of file
diff --git a/samples/Lua/TestLua/proj.mac/en.lproj/InfoPlist.strings b/samples/Lua/TestLua/proj.mac/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/samples/Lua/TestLua/proj.mac/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/samples/Lua/TestLua/proj.mac/en.lproj/MainMenu.xib b/samples/Lua/TestLua/proj.mac/en.lproj/MainMenu.xib
deleted file mode 100644
index 9f99439250..0000000000
--- a/samples/Lua/TestLua/proj.mac/en.lproj/MainMenu.xib
+++ /dev/null
@@ -1,812 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1038.36</string>
-		<string key="IBDocument.HIToolboxVersion">461.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSMenuItem</string>
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">HelloCpp</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">HelloCpp</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About HelloCpp</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="609285721">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Preferences…</string>
-									<string key="NSKeyEquiv">,</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="481834944">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-										</object>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide HelloCpp</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit HelloCpp</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="586577488">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">View</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="466310130">
-							<string key="NSTitle">View</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="204933491">
-									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Toggle Fullscreen</string>
-									<string key="NSKeyEquiv">f</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="448692316">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<object class="NSMenu" key="NSSubmenu" id="992780483">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="105068016">
-									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">HelloCpp Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">AppController</string>
-			</object>
-			<object class="NSCustomObject" id="755631768">
-				<string key="NSClassName">NSFontManager</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">495</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="105068016"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFullScreen:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="204933491"/>
-					</object>
-					<int key="connectionID">537</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713487014"/>
-							<reference ref="694149608"/>
-							<reference ref="586577488"/>
-							<reference ref="448692316"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="835318025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110575045"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="609285721"/>
-							<reference ref="481834944"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-						</object>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">129</int>
-						<reference key="object" ref="609285721"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">143</int>
-						<reference key="object" ref="481834944"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752062318"/>
-						</object>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="299356726"/>
-							<reference ref="625202149"/>
-							<reference ref="575023229"/>
-							<reference ref="1011231497"/>
-						</object>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">295</int>
-						<reference key="object" ref="586577488"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="466310130"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">296</int>
-						<reference key="object" ref="466310130"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="204933491"/>
-						</object>
-						<reference key="parent" ref="586577488"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">420</int>
-						<reference key="object" ref="755631768"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="448692316"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="992780483"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="992780483"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="105068016"/>
-						</object>
-						<reference key="parent" ref="448692316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="105068016"/>
-						<reference key="parent" ref="992780483"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">536</int>
-						<reference key="object" ref="204933491"/>
-						<reference key="parent" ref="466310130"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>129.IBPluginDependency</string>
-					<string>130.IBPluginDependency</string>
-					<string>131.IBPluginDependency</string>
-					<string>134.IBPluginDependency</string>
-					<string>136.IBPluginDependency</string>
-					<string>143.IBPluginDependency</string>
-					<string>144.IBPluginDependency</string>
-					<string>145.IBPluginDependency</string>
-					<string>149.IBPluginDependency</string>
-					<string>150.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>23.IBPluginDependency</string>
-					<string>236.IBPluginDependency</string>
-					<string>239.IBPluginDependency</string>
-					<string>24.IBPluginDependency</string>
-					<string>29.IBPluginDependency</string>
-					<string>295.IBPluginDependency</string>
-					<string>296.IBPluginDependency</string>
-					<string>420.IBPluginDependency</string>
-					<string>490.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>492.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>536.IBPluginDependency</string>
-					<string>56.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>92.IBPluginDependency</string>
-				</object>
-				<object class="NSMutableArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">541</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">AppController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>exitFullScreen:</string>
-							<string>toggleFullScreen:</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">exitFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleFullScreen:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>EAGLView</string>
-							<string>Window</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>glView</string>
-							<string>window</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">glView</string>
-								<string key="candidateClassName">EAGLView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">window</string>
-								<string key="candidateClassName">Window</string>
-							</object>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/AppController.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">EAGLView</string>
-					<string key="superclassName">NSOpenGLView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/EAGLView.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{9, 8}</string>
-				<string>{7, 2}</string>
-			</object>
-		</object>
-	</data>
-</archive>
diff --git a/samples/Cpp/TestCpp/Android.mk b/samples/test-cpp/Android.mk
similarity index 100%
rename from samples/Cpp/TestCpp/Android.mk
rename to samples/test-cpp/Android.mk
diff --git a/samples/Cpp/TestCpp/CMakeLists.txt b/samples/test-cpp/CMakeLists.txt
similarity index 100%
rename from samples/Cpp/TestCpp/CMakeLists.txt
rename to samples/test-cpp/CMakeLists.txt
diff --git a/samples/Cpp/TestCpp/Classes/AccelerometerTest/AccelerometerTest.cpp b/samples/test-cpp/Classes/AccelerometerTest/AccelerometerTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/AccelerometerTest/AccelerometerTest.cpp
rename to samples/test-cpp/Classes/AccelerometerTest/AccelerometerTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/AccelerometerTest/AccelerometerTest.h b/samples/test-cpp/Classes/AccelerometerTest/AccelerometerTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/AccelerometerTest/AccelerometerTest.h
rename to samples/test-cpp/Classes/AccelerometerTest/AccelerometerTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ActionManagerTest/ActionManagerTest.cpp b/samples/test-cpp/Classes/ActionManagerTest/ActionManagerTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ActionManagerTest/ActionManagerTest.cpp
rename to samples/test-cpp/Classes/ActionManagerTest/ActionManagerTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ActionManagerTest/ActionManagerTest.h b/samples/test-cpp/Classes/ActionManagerTest/ActionManagerTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ActionManagerTest/ActionManagerTest.h
rename to samples/test-cpp/Classes/ActionManagerTest/ActionManagerTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp b/samples/test-cpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp
rename to samples/test-cpp/Classes/ActionsEaseTest/ActionsEaseTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.h b/samples/test-cpp/Classes/ActionsEaseTest/ActionsEaseTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ActionsEaseTest/ActionsEaseTest.h
rename to samples/test-cpp/Classes/ActionsEaseTest/ActionsEaseTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp b/samples/test-cpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp
rename to samples/test-cpp/Classes/ActionsProgressTest/ActionsProgressTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.h b/samples/test-cpp/Classes/ActionsProgressTest/ActionsProgressTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ActionsProgressTest/ActionsProgressTest.h
rename to samples/test-cpp/Classes/ActionsProgressTest/ActionsProgressTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.cpp b/samples/test-cpp/Classes/ActionsTest/ActionsTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.cpp
rename to samples/test-cpp/Classes/ActionsTest/ActionsTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.h b/samples/test-cpp/Classes/ActionsTest/ActionsTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ActionsTest/ActionsTest.h
rename to samples/test-cpp/Classes/ActionsTest/ActionsTest.h
diff --git a/samples/Cpp/TestCpp/Classes/AppDelegate.cpp b/samples/test-cpp/Classes/AppDelegate.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/AppDelegate.cpp
rename to samples/test-cpp/Classes/AppDelegate.cpp
diff --git a/samples/Cpp/HelloCpp/Classes/AppDelegate.h b/samples/test-cpp/Classes/AppDelegate.h
similarity index 100%
rename from samples/Cpp/HelloCpp/Classes/AppDelegate.h
rename to samples/test-cpp/Classes/AppDelegate.h
diff --git a/samples/Cpp/TestCpp/Classes/BaseTest.cpp b/samples/test-cpp/Classes/BaseTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BaseTest.cpp
rename to samples/test-cpp/Classes/BaseTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BaseTest.h b/samples/test-cpp/Classes/BaseTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BaseTest.h
rename to samples/test-cpp/Classes/BaseTest.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp b/samples/test-cpp/Classes/Box2DTest/Box2dTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.cpp
rename to samples/test-cpp/Classes/Box2DTest/Box2dTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h b/samples/test-cpp/Classes/Box2DTest/Box2dTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h
rename to samples/test-cpp/Classes/Box2DTest/Box2dTest.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp b/samples/test-cpp/Classes/Box2DTestBed/Box2dView.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp
rename to samples/test-cpp/Classes/Box2DTestBed/Box2dView.cpp
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h b/samples/test-cpp/Classes/Box2DTestBed/Box2dView.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h
rename to samples/test-cpp/Classes/Box2DTestBed/Box2dView.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp b/samples/test-cpp/Classes/Box2DTestBed/GLES-Render.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp
rename to samples/test-cpp/Classes/Box2DTestBed/GLES-Render.cpp
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/GLES-Render.h b/samples/test-cpp/Classes/Box2DTestBed/GLES-Render.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/GLES-Render.h
rename to samples/test-cpp/Classes/Box2DTestBed/GLES-Render.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Test.cpp b/samples/test-cpp/Classes/Box2DTestBed/Test.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Test.cpp
rename to samples/test-cpp/Classes/Box2DTestBed/Test.cpp
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Test.h b/samples/test-cpp/Classes/Box2DTestBed/Test.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Test.h
rename to samples/test-cpp/Classes/Box2DTestBed/Test.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/TestEntries.cpp b/samples/test-cpp/Classes/Box2DTestBed/TestEntries.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/TestEntries.cpp
rename to samples/test-cpp/Classes/Box2DTestBed/TestEntries.cpp
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/AddPair.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/AddPair.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/AddPair.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/AddPair.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ApplyForce.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ApplyForce.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ApplyForce.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ApplyForce.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/BodyTypes.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/BodyTypes.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/BodyTypes.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/BodyTypes.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Breakable.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Breakable.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Breakable.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Breakable.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Bridge.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Bridge.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Bridge.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Bridge.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/BulletTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/BulletTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/BulletTest.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/BulletTest.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Cantilever.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Cantilever.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Cantilever.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Cantilever.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Car.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Car.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Car.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Car.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Chain.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Chain.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Chain.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Chain.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CharacterCollision.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/CharacterCollision.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CharacterCollision.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/CharacterCollision.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/CollisionFiltering.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/CollisionProcessing.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CompoundShapes.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/CompoundShapes.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/CompoundShapes.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/CompoundShapes.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Confined.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Confined.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Confined.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Confined.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ContinuousTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ContinuousTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ContinuousTest.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ContinuousTest.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ConvexHull.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ConvexHull.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ConvexHull.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ConvexHull.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ConveyorBelt.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DistanceTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/DistanceTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DistanceTest.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/DistanceTest.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Dominos.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Dominos.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Dominos.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Dominos.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/DumpShell.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DumpShell.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/DumpShell.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/DynamicTreeTest.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeShapes.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/EdgeShapes.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeShapes.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/EdgeShapes.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/EdgeTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/EdgeTest.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/EdgeTest.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Gears.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Gears.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Gears.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Gears.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Mobile.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Mobile.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Mobile.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Mobile.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/MobileBalanced.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/MobileBalanced.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/MobileBalanced.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/MobileBalanced.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/MotorJoint.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/MotorJoint.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/MotorJoint.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/MotorJoint.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/OneSidedPlatform.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pinball.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Pinball.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pinball.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Pinball.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/PolyCollision.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/PolyCollision.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/PolyCollision.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/PolyCollision.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/PolyShapes.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/PolyShapes.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/PolyShapes.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/PolyShapes.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Prismatic.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Prismatic.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Prismatic.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Prismatic.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pulleys.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Pulleys.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pulleys.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Pulleys.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pyramid.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Pyramid.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Pyramid.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Pyramid.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/RayCast.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/RayCast.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/RayCast.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/RayCast.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Revolute.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Revolute.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Revolute.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Revolute.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Rope.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Rope.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Rope.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Rope.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/RopeJoint.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/RopeJoint.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/RopeJoint.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/RopeJoint.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SensorTest.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/SensorTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SensorTest.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/SensorTest.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ShapeEditing.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/ShapeEditing.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/ShapeEditing.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/ShapeEditing.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SliderCrank.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/SliderCrank.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SliderCrank.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/SliderCrank.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SphereStack.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/SphereStack.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/SphereStack.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/SphereStack.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/TheoJansen.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/TheoJansen.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/TheoJansen.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/TheoJansen.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Tiles.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Tiles.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Tiles.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Tiles.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/TimeOfImpact.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Tumbler.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Tumbler.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Tumbler.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Tumbler.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VaryingFriction.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/VaryingFriction.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VaryingFriction.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/VaryingFriction.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/VaryingRestitution.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VerticalStack.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/VerticalStack.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/VerticalStack.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/VerticalStack.h
diff --git a/samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Web.h b/samples/test-cpp/Classes/Box2DTestBed/Tests/Web.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Box2DTestBed/Tests/Web.h
rename to samples/test-cpp/Classes/Box2DTestBed/Tests/Web.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-1159.cpp b/samples/test-cpp/Classes/BugsTest/Bug-1159.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-1159.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-1159.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-1159.h b/samples/test-cpp/Classes/BugsTest/Bug-1159.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-1159.h
rename to samples/test-cpp/Classes/BugsTest/Bug-1159.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-1174.cpp b/samples/test-cpp/Classes/BugsTest/Bug-1174.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-1174.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-1174.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-1174.h b/samples/test-cpp/Classes/BugsTest/Bug-1174.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-1174.h
rename to samples/test-cpp/Classes/BugsTest/Bug-1174.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-350.cpp b/samples/test-cpp/Classes/BugsTest/Bug-350.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-350.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-350.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-350.h b/samples/test-cpp/Classes/BugsTest/Bug-350.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-350.h
rename to samples/test-cpp/Classes/BugsTest/Bug-350.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-422.cpp b/samples/test-cpp/Classes/BugsTest/Bug-422.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-422.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-422.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-422.h b/samples/test-cpp/Classes/BugsTest/Bug-422.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-422.h
rename to samples/test-cpp/Classes/BugsTest/Bug-422.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/Bug-458.cpp b/samples/test-cpp/Classes/BugsTest/Bug-458/Bug-458.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/Bug-458.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-458/Bug-458.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/Bug-458.h b/samples/test-cpp/Classes/BugsTest/Bug-458/Bug-458.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/Bug-458.h
rename to samples/test-cpp/Classes/BugsTest/Bug-458/Bug-458.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp b/samples/test-cpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h b/samples/test-cpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h
rename to samples/test-cpp/Classes/BugsTest/Bug-458/QuestionContainerSprite.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-624.cpp b/samples/test-cpp/Classes/BugsTest/Bug-624.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-624.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-624.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-624.h b/samples/test-cpp/Classes/BugsTest/Bug-624.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-624.h
rename to samples/test-cpp/Classes/BugsTest/Bug-624.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-886.cpp b/samples/test-cpp/Classes/BugsTest/Bug-886.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-886.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-886.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-886.h b/samples/test-cpp/Classes/BugsTest/Bug-886.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-886.h
rename to samples/test-cpp/Classes/BugsTest/Bug-886.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-899.cpp b/samples/test-cpp/Classes/BugsTest/Bug-899.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-899.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-899.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-899.h b/samples/test-cpp/Classes/BugsTest/Bug-899.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-899.h
rename to samples/test-cpp/Classes/BugsTest/Bug-899.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-914.cpp b/samples/test-cpp/Classes/BugsTest/Bug-914.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-914.cpp
rename to samples/test-cpp/Classes/BugsTest/Bug-914.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/Bug-914.h b/samples/test-cpp/Classes/BugsTest/Bug-914.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/Bug-914.h
rename to samples/test-cpp/Classes/BugsTest/Bug-914.h
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/BugsTest.cpp b/samples/test-cpp/Classes/BugsTest/BugsTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/BugsTest.cpp
rename to samples/test-cpp/Classes/BugsTest/BugsTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/BugsTest/BugsTest.h b/samples/test-cpp/Classes/BugsTest/BugsTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/BugsTest/BugsTest.h
rename to samples/test-cpp/Classes/BugsTest/BugsTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.cpp b/samples/test-cpp/Classes/ChipmunkTest/ChipmunkTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.cpp
rename to samples/test-cpp/Classes/ChipmunkTest/ChipmunkTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h b/samples/test-cpp/Classes/ChipmunkTest/ChipmunkTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ChipmunkTest/ChipmunkTest.h
rename to samples/test-cpp/Classes/ChipmunkTest/ChipmunkTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp b/samples/test-cpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp
rename to samples/test-cpp/Classes/ClickAndMoveTest/ClickAndMoveTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h b/samples/test-cpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h
rename to samples/test-cpp/Classes/ClickAndMoveTest/ClickAndMoveTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/samples/test-cpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
rename to samples/test-cpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h b/samples/test-cpp/Classes/ClippingNodeTest/ClippingNodeTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
rename to samples/test-cpp/Classes/ClippingNodeTest/ClippingNodeTest.h
diff --git a/samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp b/samples/test-cpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp
rename to samples/test-cpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.h b/samples/test-cpp/Classes/CocosDenshionTest/CocosDenshionTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.h
rename to samples/test-cpp/Classes/CocosDenshionTest/CocosDenshionTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ConfigurationTest/ConfigurationTest.cpp b/samples/test-cpp/Classes/ConfigurationTest/ConfigurationTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ConfigurationTest/ConfigurationTest.cpp
rename to samples/test-cpp/Classes/ConfigurationTest/ConfigurationTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ConfigurationTest/ConfigurationTest.h b/samples/test-cpp/Classes/ConfigurationTest/ConfigurationTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ConfigurationTest/ConfigurationTest.h
rename to samples/test-cpp/Classes/ConfigurationTest/ConfigurationTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ConsoleTest/ConsoleTest.cpp b/samples/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ConsoleTest/ConsoleTest.cpp
rename to samples/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ConsoleTest/ConsoleTest.h b/samples/test-cpp/Classes/ConsoleTest/ConsoleTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ConsoleTest/ConsoleTest.h
rename to samples/test-cpp/Classes/ConsoleTest/ConsoleTest.h
diff --git a/samples/Cpp/TestCpp/Classes/CurlTest/CurlTest.cpp b/samples/test-cpp/Classes/CurlTest/CurlTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/CurlTest/CurlTest.cpp
rename to samples/test-cpp/Classes/CurlTest/CurlTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/CurlTest/CurlTest.h b/samples/test-cpp/Classes/CurlTest/CurlTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/CurlTest/CurlTest.h
rename to samples/test-cpp/Classes/CurlTest/CurlTest.h
diff --git a/samples/Cpp/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp b/samples/test-cpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp
rename to samples/test-cpp/Classes/CurrentLanguageTest/CurrentLanguageTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h b/samples/test-cpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h
rename to samples/test-cpp/Classes/CurrentLanguageTest/CurrentLanguageTest.h
diff --git a/samples/Cpp/TestCpp/Classes/DataVisitorTest/DataVisitorTest.cpp b/samples/test-cpp/Classes/DataVisitorTest/DataVisitorTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/DataVisitorTest/DataVisitorTest.cpp
rename to samples/test-cpp/Classes/DataVisitorTest/DataVisitorTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/DataVisitorTest/DataVisitorTest.h b/samples/test-cpp/Classes/DataVisitorTest/DataVisitorTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/DataVisitorTest/DataVisitorTest.h
rename to samples/test-cpp/Classes/DataVisitorTest/DataVisitorTest.h
diff --git a/samples/Cpp/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp b/samples/test-cpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
rename to samples/test-cpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h b/samples/test-cpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h
rename to samples/test-cpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.h
diff --git a/samples/Cpp/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp b/samples/test-cpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp
rename to samples/test-cpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h b/samples/test-cpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h
rename to samples/test-cpp/Classes/EffectsAdvancedTest/EffectsAdvancedTest.h
diff --git a/samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp b/samples/test-cpp/Classes/EffectsTest/EffectsTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.cpp
rename to samples/test-cpp/Classes/EffectsTest/EffectsTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.h b/samples/test-cpp/Classes/EffectsTest/EffectsTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/EffectsTest/EffectsTest.h
rename to samples/test-cpp/Classes/EffectsTest/EffectsTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ComponentsTestScene.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/EnemyController.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/GameOverScene.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/PlayerController.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/ProjectileController.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioComponentsTest/SceneController.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/CocosGUIScene.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelAtlasTest/UILabelAtlasTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelBMFontTest/UILabelBMFontTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILabelTest/UILabelTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIListViewTest/UIListViewTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UILoadingBarTest/UILoadingBarTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIPageViewTest/UIPageViewTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScene.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISceneManager.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UISliderTest/UISliderTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioGUITest/UIWidgetAddNodeTest/UIWidgetAddNodeTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/SceneEditorTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/EventDef.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/acts.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h b/samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocoStudioSceneTest/TriggerCode/cons.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/CocosBuilderTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/LabelTest/LabelTestLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ParticleSystemTest/ParticleSystemTestLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/ScrollViewTest/ScrollViewTestLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/SpriteTest/SpriteTestLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackLayerLoader.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h b/samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h
rename to samples/test-cpp/Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlButtonTest/CCControlButtonTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlColourPicker/CCControlColourPickerTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlPotentiometerTest/CCControlPotentiometerTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSceneManager.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlStepperTest/CCControlStepperTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h b/samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSwitchTest/CCControlSwitchTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h b/samples/test-cpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/EditBoxTest/EditBoxTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/ExtensionsTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/ExtensionsTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h b/samples/test-cpp/Classes/ExtensionsTest/ExtensionsTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/ExtensionsTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/SocketIOTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h b/samples/test-cpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/NetworkTest/WebSocketTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h b/samples/test-cpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp b/samples/test-cpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h b/samples/test-cpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h
rename to samples/test-cpp/Classes/ExtensionsTest/Scale9SpriteTest/Scale9SpriteTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp b/samples/test-cpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h b/samples/test-cpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h
rename to samples/test-cpp/Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.h
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp b/samples/test-cpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp
rename to samples/test-cpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h b/samples/test-cpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h
rename to samples/test-cpp/Classes/ExtensionsTest/TableViewTest/TableViewTestScene.h
diff --git a/samples/Cpp/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp b/samples/test-cpp/Classes/FileUtilsTest/FileUtilsTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/FileUtilsTest/FileUtilsTest.cpp
rename to samples/test-cpp/Classes/FileUtilsTest/FileUtilsTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/FileUtilsTest/FileUtilsTest.h b/samples/test-cpp/Classes/FileUtilsTest/FileUtilsTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/FileUtilsTest/FileUtilsTest.h
rename to samples/test-cpp/Classes/FileUtilsTest/FileUtilsTest.h
diff --git a/samples/Cpp/TestCpp/Classes/FontTest/FontTest.cpp b/samples/test-cpp/Classes/FontTest/FontTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/FontTest/FontTest.cpp
rename to samples/test-cpp/Classes/FontTest/FontTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/FontTest/FontTest.h b/samples/test-cpp/Classes/FontTest/FontTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/FontTest/FontTest.h
rename to samples/test-cpp/Classes/FontTest/FontTest.h
diff --git a/samples/Cpp/TestCpp/Classes/InputTest/MouseTest.cpp b/samples/test-cpp/Classes/InputTest/MouseTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/InputTest/MouseTest.cpp
rename to samples/test-cpp/Classes/InputTest/MouseTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/InputTest/MouseTest.h b/samples/test-cpp/Classes/InputTest/MouseTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/InputTest/MouseTest.h
rename to samples/test-cpp/Classes/InputTest/MouseTest.h
diff --git a/samples/Cpp/TestCpp/Classes/IntervalTest/IntervalTest.cpp b/samples/test-cpp/Classes/IntervalTest/IntervalTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/IntervalTest/IntervalTest.cpp
rename to samples/test-cpp/Classes/IntervalTest/IntervalTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/IntervalTest/IntervalTest.h b/samples/test-cpp/Classes/IntervalTest/IntervalTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/IntervalTest/IntervalTest.h
rename to samples/test-cpp/Classes/IntervalTest/IntervalTest.h
diff --git a/samples/Cpp/TestCpp/Classes/KeyboardTest/KeyboardTest.cpp b/samples/test-cpp/Classes/KeyboardTest/KeyboardTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/KeyboardTest/KeyboardTest.cpp
rename to samples/test-cpp/Classes/KeyboardTest/KeyboardTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/KeyboardTest/KeyboardTest.h b/samples/test-cpp/Classes/KeyboardTest/KeyboardTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/KeyboardTest/KeyboardTest.h
rename to samples/test-cpp/Classes/KeyboardTest/KeyboardTest.h
diff --git a/samples/Cpp/TestCpp/Classes/KeypadTest/KeypadTest.cpp b/samples/test-cpp/Classes/KeypadTest/KeypadTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/KeypadTest/KeypadTest.cpp
rename to samples/test-cpp/Classes/KeypadTest/KeypadTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/KeypadTest/KeypadTest.h b/samples/test-cpp/Classes/KeypadTest/KeypadTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/KeypadTest/KeypadTest.h
rename to samples/test-cpp/Classes/KeypadTest/KeypadTest.h
diff --git a/samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp b/samples/test-cpp/Classes/LabelTest/LabelTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
rename to samples/test-cpp/Classes/LabelTest/LabelTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.h b/samples/test-cpp/Classes/LabelTest/LabelTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.h
rename to samples/test-cpp/Classes/LabelTest/LabelTest.h
diff --git a/samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp b/samples/test-cpp/Classes/LabelTest/LabelTestNew.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp
rename to samples/test-cpp/Classes/LabelTest/LabelTestNew.cpp
diff --git a/samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h b/samples/test-cpp/Classes/LabelTest/LabelTestNew.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h
rename to samples/test-cpp/Classes/LabelTest/LabelTestNew.h
diff --git a/samples/Cpp/TestCpp/Classes/LayerTest/LayerTest.cpp b/samples/test-cpp/Classes/LayerTest/LayerTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/LayerTest/LayerTest.cpp
rename to samples/test-cpp/Classes/LayerTest/LayerTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/LayerTest/LayerTest.h b/samples/test-cpp/Classes/LayerTest/LayerTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/LayerTest/LayerTest.h
rename to samples/test-cpp/Classes/LayerTest/LayerTest.h
diff --git a/samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.cpp b/samples/test-cpp/Classes/MenuTest/MenuTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.cpp
rename to samples/test-cpp/Classes/MenuTest/MenuTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.h b/samples/test-cpp/Classes/MenuTest/MenuTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/MenuTest/MenuTest.h
rename to samples/test-cpp/Classes/MenuTest/MenuTest.h
diff --git a/samples/Cpp/TestCpp/Classes/MotionStreakTest/MotionStreakTest.cpp b/samples/test-cpp/Classes/MotionStreakTest/MotionStreakTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/MotionStreakTest/MotionStreakTest.cpp
rename to samples/test-cpp/Classes/MotionStreakTest/MotionStreakTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/MotionStreakTest/MotionStreakTest.h b/samples/test-cpp/Classes/MotionStreakTest/MotionStreakTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/MotionStreakTest/MotionStreakTest.h
rename to samples/test-cpp/Classes/MotionStreakTest/MotionStreakTest.h
diff --git a/samples/Cpp/TestCpp/Classes/MutiTouchTest/MutiTouchTest.cpp b/samples/test-cpp/Classes/MutiTouchTest/MutiTouchTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/MutiTouchTest/MutiTouchTest.cpp
rename to samples/test-cpp/Classes/MutiTouchTest/MutiTouchTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/MutiTouchTest/MutiTouchTest.h b/samples/test-cpp/Classes/MutiTouchTest/MutiTouchTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/MutiTouchTest/MutiTouchTest.h
rename to samples/test-cpp/Classes/MutiTouchTest/MutiTouchTest.h
diff --git a/samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp b/samples/test-cpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
rename to samples/test-cpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h b/samples/test-cpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
rename to samples/test-cpp/Classes/NewEventDispatcherTest/NewEventDispatcherTest.h
diff --git a/samples/Cpp/TestCpp/Classes/NewRendererTest/NewRendererTest.cpp b/samples/test-cpp/Classes/NewRendererTest/NewRendererTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/NewRendererTest/NewRendererTest.cpp
rename to samples/test-cpp/Classes/NewRendererTest/NewRendererTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/NewRendererTest/NewRendererTest.h b/samples/test-cpp/Classes/NewRendererTest/NewRendererTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/NewRendererTest/NewRendererTest.h
rename to samples/test-cpp/Classes/NewRendererTest/NewRendererTest.h
diff --git a/samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp b/samples/test-cpp/Classes/NodeTest/NodeTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
rename to samples/test-cpp/Classes/NodeTest/NodeTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.h b/samples/test-cpp/Classes/NodeTest/NodeTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.h
rename to samples/test-cpp/Classes/NodeTest/NodeTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ParallaxTest/ParallaxTest.cpp b/samples/test-cpp/Classes/ParallaxTest/ParallaxTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ParallaxTest/ParallaxTest.cpp
rename to samples/test-cpp/Classes/ParallaxTest/ParallaxTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ParallaxTest/ParallaxTest.h b/samples/test-cpp/Classes/ParallaxTest/ParallaxTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ParallaxTest/ParallaxTest.h
rename to samples/test-cpp/Classes/ParallaxTest/ParallaxTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.cpp b/samples/test-cpp/Classes/ParticleTest/ParticleTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.cpp
rename to samples/test-cpp/Classes/ParticleTest/ParticleTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.h b/samples/test-cpp/Classes/ParticleTest/ParticleTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ParticleTest/ParticleTest.h
rename to samples/test-cpp/Classes/ParticleTest/ParticleTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceAllocTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceAllocTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceAllocTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceAllocTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceAllocTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceContainerTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceContainerTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceContainerTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceContainerTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceContainerTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceEventDispatcherTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceLabelTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceLabelTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceLabelTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceLabelTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceLabelTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceNodeChildrenTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceParticleTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceParticleTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceParticleTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceParticleTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceParticleTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceRendererTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceRendererTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceRendererTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceRendererTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceRendererTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceSpriteTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceSpriteTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceSpriteTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceSpriteTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceTextureTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTextureTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceTextureTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTextureTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTextureTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp b/samples/test-cpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTouchesTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.h b/samples/test-cpp/Classes/PerformanceTest/PerformanceTouchesTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PerformanceTest/PerformanceTouchesTest.h
rename to samples/test-cpp/Classes/PerformanceTest/PerformanceTouchesTest.h
diff --git a/samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.cpp b/samples/test-cpp/Classes/PhysicsTest/PhysicsTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.cpp
rename to samples/test-cpp/Classes/PhysicsTest/PhysicsTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h b/samples/test-cpp/Classes/PhysicsTest/PhysicsTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
rename to samples/test-cpp/Classes/PhysicsTest/PhysicsTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp b/samples/test-cpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp
rename to samples/test-cpp/Classes/ReleasePoolTest/ReleasePoolTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.h b/samples/test-cpp/Classes/ReleasePoolTest/ReleasePoolTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ReleasePoolTest/ReleasePoolTest.h
rename to samples/test-cpp/Classes/ReleasePoolTest/ReleasePoolTest.h
diff --git a/samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp b/samples/test-cpp/Classes/RenderTextureTest/RenderTextureTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.cpp
rename to samples/test-cpp/Classes/RenderTextureTest/RenderTextureTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h b/samples/test-cpp/Classes/RenderTextureTest/RenderTextureTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/RenderTextureTest/RenderTextureTest.h
rename to samples/test-cpp/Classes/RenderTextureTest/RenderTextureTest.h
diff --git a/samples/Cpp/TestCpp/Classes/RotateWorldTest/RotateWorldTest.cpp b/samples/test-cpp/Classes/RotateWorldTest/RotateWorldTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/RotateWorldTest/RotateWorldTest.cpp
rename to samples/test-cpp/Classes/RotateWorldTest/RotateWorldTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/RotateWorldTest/RotateWorldTest.h b/samples/test-cpp/Classes/RotateWorldTest/RotateWorldTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/RotateWorldTest/RotateWorldTest.h
rename to samples/test-cpp/Classes/RotateWorldTest/RotateWorldTest.h
diff --git a/samples/Cpp/TestCpp/Classes/SceneTest/SceneTest.cpp b/samples/test-cpp/Classes/SceneTest/SceneTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/SceneTest/SceneTest.cpp
rename to samples/test-cpp/Classes/SceneTest/SceneTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/SceneTest/SceneTest.h b/samples/test-cpp/Classes/SceneTest/SceneTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/SceneTest/SceneTest.h
rename to samples/test-cpp/Classes/SceneTest/SceneTest.h
diff --git a/samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp b/samples/test-cpp/Classes/SchedulerTest/SchedulerTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.cpp
rename to samples/test-cpp/Classes/SchedulerTest/SchedulerTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.h b/samples/test-cpp/Classes/SchedulerTest/SchedulerTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/SchedulerTest/SchedulerTest.h
rename to samples/test-cpp/Classes/SchedulerTest/SchedulerTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.cpp b/samples/test-cpp/Classes/ShaderTest/ShaderTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.cpp
rename to samples/test-cpp/Classes/ShaderTest/ShaderTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.h b/samples/test-cpp/Classes/ShaderTest/ShaderTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest.h
rename to samples/test-cpp/Classes/ShaderTest/ShaderTest.h
diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.cpp b/samples/test-cpp/Classes/ShaderTest/ShaderTest2.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.cpp
rename to samples/test-cpp/Classes/ShaderTest/ShaderTest2.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.h b/samples/test-cpp/Classes/ShaderTest/ShaderTest2.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ShaderTest/ShaderTest2.h
rename to samples/test-cpp/Classes/ShaderTest/ShaderTest2.h
diff --git a/samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.cpp b/samples/test-cpp/Classes/SpineTest/SpineTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.cpp
rename to samples/test-cpp/Classes/SpineTest/SpineTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.h b/samples/test-cpp/Classes/SpineTest/SpineTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/SpineTest/SpineTest.h
rename to samples/test-cpp/Classes/SpineTest/SpineTest.h
diff --git a/samples/Cpp/TestCpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id b/samples/test-cpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id
rename to samples/test-cpp/Classes/SpriteTest/SpriteTest.cpp.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Classes/SpriteTest/SpriteTest.h b/samples/test-cpp/Classes/SpriteTest/SpriteTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/SpriteTest/SpriteTest.h
rename to samples/test-cpp/Classes/SpriteTest/SpriteTest.h
diff --git a/samples/Cpp/TestCpp/Classes/TextInputTest/TextInputTest.cpp b/samples/test-cpp/Classes/TextInputTest/TextInputTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TextInputTest/TextInputTest.cpp
rename to samples/test-cpp/Classes/TextInputTest/TextInputTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/TextInputTest/TextInputTest.h b/samples/test-cpp/Classes/TextInputTest/TextInputTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TextInputTest/TextInputTest.h
rename to samples/test-cpp/Classes/TextInputTest/TextInputTest.h
diff --git a/samples/Cpp/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp b/samples/test-cpp/Classes/Texture2dTest/Texture2dTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Texture2dTest/Texture2dTest.cpp
rename to samples/test-cpp/Classes/Texture2dTest/Texture2dTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/Texture2dTest/Texture2dTest.h b/samples/test-cpp/Classes/Texture2dTest/Texture2dTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/Texture2dTest/Texture2dTest.h
rename to samples/test-cpp/Classes/Texture2dTest/Texture2dTest.h
diff --git a/samples/Cpp/TestCpp/Classes/TextureCacheTest/TextureCacheTest.cpp b/samples/test-cpp/Classes/TextureCacheTest/TextureCacheTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TextureCacheTest/TextureCacheTest.cpp
rename to samples/test-cpp/Classes/TextureCacheTest/TextureCacheTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/TextureCacheTest/TextureCacheTest.h b/samples/test-cpp/Classes/TextureCacheTest/TextureCacheTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TextureCacheTest/TextureCacheTest.h
rename to samples/test-cpp/Classes/TextureCacheTest/TextureCacheTest.h
diff --git a/samples/Cpp/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp b/samples/test-cpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp
rename to samples/test-cpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h b/samples/test-cpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h
rename to samples/test-cpp/Classes/TexturePackerEncryptionTest/TextureAtlasEncryptionTest.h
diff --git a/samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp b/samples/test-cpp/Classes/TileMapTest/TileMapTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.cpp
rename to samples/test-cpp/Classes/TileMapTest/TileMapTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.h b/samples/test-cpp/Classes/TileMapTest/TileMapTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TileMapTest/TileMapTest.h
rename to samples/test-cpp/Classes/TileMapTest/TileMapTest.h
diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/Ball.cpp b/samples/test-cpp/Classes/TouchesTest/Ball.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TouchesTest/Ball.cpp
rename to samples/test-cpp/Classes/TouchesTest/Ball.cpp
diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/Ball.h b/samples/test-cpp/Classes/TouchesTest/Ball.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TouchesTest/Ball.h
rename to samples/test-cpp/Classes/TouchesTest/Ball.h
diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/Paddle.cpp b/samples/test-cpp/Classes/TouchesTest/Paddle.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TouchesTest/Paddle.cpp
rename to samples/test-cpp/Classes/TouchesTest/Paddle.cpp
diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/Paddle.h b/samples/test-cpp/Classes/TouchesTest/Paddle.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TouchesTest/Paddle.h
rename to samples/test-cpp/Classes/TouchesTest/Paddle.h
diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.cpp b/samples/test-cpp/Classes/TouchesTest/TouchesTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.cpp
rename to samples/test-cpp/Classes/TouchesTest/TouchesTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.h b/samples/test-cpp/Classes/TouchesTest/TouchesTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TouchesTest/TouchesTest.h
rename to samples/test-cpp/Classes/TouchesTest/TouchesTest.h
diff --git a/samples/Cpp/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp b/samples/test-cpp/Classes/TransitionsTest/TransitionsTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TransitionsTest/TransitionsTest.cpp
rename to samples/test-cpp/Classes/TransitionsTest/TransitionsTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/TransitionsTest/TransitionsTest.h b/samples/test-cpp/Classes/TransitionsTest/TransitionsTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/TransitionsTest/TransitionsTest.h
rename to samples/test-cpp/Classes/TransitionsTest/TransitionsTest.h
diff --git a/samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.cpp b/samples/test-cpp/Classes/UnitTest/UnitTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.cpp
rename to samples/test-cpp/Classes/UnitTest/UnitTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.h b/samples/test-cpp/Classes/UnitTest/UnitTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/UnitTest/UnitTest.h
rename to samples/test-cpp/Classes/UnitTest/UnitTest.h
diff --git a/samples/Cpp/TestCpp/Classes/UserDefaultTest/UserDefaultTest.cpp b/samples/test-cpp/Classes/UserDefaultTest/UserDefaultTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/UserDefaultTest/UserDefaultTest.cpp
rename to samples/test-cpp/Classes/UserDefaultTest/UserDefaultTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/UserDefaultTest/UserDefaultTest.h b/samples/test-cpp/Classes/UserDefaultTest/UserDefaultTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/UserDefaultTest/UserDefaultTest.h
rename to samples/test-cpp/Classes/UserDefaultTest/UserDefaultTest.h
diff --git a/samples/Cpp/TestCpp/Classes/VisibleRect.cpp b/samples/test-cpp/Classes/VisibleRect.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/VisibleRect.cpp
rename to samples/test-cpp/Classes/VisibleRect.cpp
diff --git a/samples/Cpp/TestCpp/Classes/VisibleRect.h b/samples/test-cpp/Classes/VisibleRect.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/VisibleRect.h
rename to samples/test-cpp/Classes/VisibleRect.h
diff --git a/samples/Cpp/TestCpp/Classes/ZwoptexTest/ZwoptexTest.cpp b/samples/test-cpp/Classes/ZwoptexTest/ZwoptexTest.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ZwoptexTest/ZwoptexTest.cpp
rename to samples/test-cpp/Classes/ZwoptexTest/ZwoptexTest.cpp
diff --git a/samples/Cpp/TestCpp/Classes/ZwoptexTest/ZwoptexTest.h b/samples/test-cpp/Classes/ZwoptexTest/ZwoptexTest.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/ZwoptexTest/ZwoptexTest.h
rename to samples/test-cpp/Classes/ZwoptexTest/ZwoptexTest.h
diff --git a/samples/Cpp/TestCpp/Classes/controller.cpp b/samples/test-cpp/Classes/controller.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/controller.cpp
rename to samples/test-cpp/Classes/controller.cpp
diff --git a/samples/Cpp/TestCpp/Classes/controller.h b/samples/test-cpp/Classes/controller.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/controller.h
rename to samples/test-cpp/Classes/controller.h
diff --git a/samples/Cpp/TestCpp/Classes/testBasic.cpp b/samples/test-cpp/Classes/testBasic.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/testBasic.cpp
rename to samples/test-cpp/Classes/testBasic.cpp
diff --git a/samples/Cpp/TestCpp/Classes/testBasic.h b/samples/test-cpp/Classes/testBasic.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/testBasic.h
rename to samples/test-cpp/Classes/testBasic.h
diff --git a/samples/Cpp/TestCpp/Classes/testResource.h b/samples/test-cpp/Classes/testResource.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/testResource.h
rename to samples/test-cpp/Classes/testResource.h
diff --git a/samples/Cpp/TestCpp/Classes/tests.h b/samples/test-cpp/Classes/tests.h
similarity index 100%
rename from samples/Cpp/TestCpp/Classes/tests.h
rename to samples/test-cpp/Classes/tests.h
diff --git a/samples/Cpp/HelloCpp/Resources/.gitignore b/samples/test-cpp/Resources/.gitignore
similarity index 100%
rename from samples/Cpp/HelloCpp/Resources/.gitignore
rename to samples/test-cpp/Resources/.gitignore
diff --git a/samples/Cpp/TestCpp/Resources/Hello.png.REMOVED.git-id b/samples/test-cpp/Resources/Hello.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Hello.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Hello.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/HelloWorld.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/HelloWorld.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/HelloWorld.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/HelloWorld.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/PlanetCute-1024x1024.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/atlastest.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/atlastest.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/atlastest.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/atlastest.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/background1.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/background1.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/background1.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/background1.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/background2.jpg.REMOVED.git-id b/samples/test-cpp/Resources/Images/background2.jpg.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/background2.jpg.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/background2.jpg.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/background2.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/background2.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/background2.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/background2.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/bugs/bug886.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/bugs/bug886.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/bugs/bug886.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/bugs/bug886.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/grossini_dance_atlas-mono.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/landscape-1024x1024.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/noise.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/noise.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/noise.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/noise.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/spritesheet1.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/spritesheet1.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/spritesheet1.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/spritesheet1.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/stone.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/stone.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/stone.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/stone.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024.png.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024.png.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/test_1021x1024.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/test_1021x1024_a8.pvr.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/test_1021x1024_rgb888.pvr.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/test_1021x1024_rgb888.pvr.gz.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/test_1021x1024_rgba4444.pvr.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/test_1021x1024_rgba4444.pvr.gz.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/test_1021x1024_rgba8888.pvr.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id b/samples/test-cpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id
rename to samples/test-cpp/Resources/Images/test_1021x1024_rgba8888.pvr.gz.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-hd/test4.txt b/samples/test-cpp/Resources/Misc/resources-hd/test4.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/resources-hd/test4.txt
rename to samples/test-cpp/Resources/Misc/resources-hd/test4.txt
diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-ipad/test2.txt b/samples/test-cpp/Resources/Misc/resources-ipad/test2.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/resources-ipad/test2.txt
rename to samples/test-cpp/Resources/Misc/resources-ipad/test2.txt
diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-ipadhd/test1.txt b/samples/test-cpp/Resources/Misc/resources-ipadhd/test1.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/resources-ipadhd/test1.txt
rename to samples/test-cpp/Resources/Misc/resources-ipadhd/test1.txt
diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-iphone/test6.txt b/samples/test-cpp/Resources/Misc/resources-iphone/test6.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/resources-iphone/test6.txt
rename to samples/test-cpp/Resources/Misc/resources-iphone/test6.txt
diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-mac/test2.txt b/samples/test-cpp/Resources/Misc/resources-mac/test2.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/resources-mac/test2.txt
rename to samples/test-cpp/Resources/Misc/resources-mac/test2.txt
diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-machd/test1.txt b/samples/test-cpp/Resources/Misc/resources-machd/test1.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/resources-machd/test1.txt
rename to samples/test-cpp/Resources/Misc/resources-machd/test1.txt
diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-wide/test5.txt b/samples/test-cpp/Resources/Misc/resources-wide/test5.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/resources-wide/test5.txt
rename to samples/test-cpp/Resources/Misc/resources-wide/test5.txt
diff --git a/samples/Cpp/TestCpp/Resources/Misc/resources-widehd/test3.txt b/samples/test-cpp/Resources/Misc/resources-widehd/test3.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/resources-widehd/test3.txt
rename to samples/test-cpp/Resources/Misc/resources-widehd/test3.txt
diff --git a/samples/Cpp/TestCpp/Resources/Misc/searchpath1/file1.txt b/samples/test-cpp/Resources/Misc/searchpath1/file1.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/searchpath1/file1.txt
rename to samples/test-cpp/Resources/Misc/searchpath1/file1.txt
diff --git a/samples/Cpp/TestCpp/Resources/Misc/searchpath2/resources-ipad/file2.txt b/samples/test-cpp/Resources/Misc/searchpath2/resources-ipad/file2.txt
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Misc/searchpath2/resources-ipad/file2.txt
rename to samples/test-cpp/Resources/Misc/searchpath2/resources-ipad/file2.txt
diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_ColorBars.vsh b/samples/test-cpp/Resources/Shaders/example_ColorBars.vsh
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Shaders/example_ColorBars.vsh
rename to samples/test-cpp/Resources/Shaders/example_ColorBars.vsh
diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Flower.vsh b/samples/test-cpp/Resources/Shaders/example_Flower.vsh
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Shaders/example_Flower.vsh
rename to samples/test-cpp/Resources/Shaders/example_Flower.vsh
diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Heart.vsh b/samples/test-cpp/Resources/Shaders/example_Heart.vsh
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Shaders/example_Heart.vsh
rename to samples/test-cpp/Resources/Shaders/example_Heart.vsh
diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Julia.vsh b/samples/test-cpp/Resources/Shaders/example_Julia.vsh
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Shaders/example_Julia.vsh
rename to samples/test-cpp/Resources/Shaders/example_Julia.vsh
diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Mandelbrot.vsh b/samples/test-cpp/Resources/Shaders/example_Mandelbrot.vsh
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Shaders/example_Mandelbrot.vsh
rename to samples/test-cpp/Resources/Shaders/example_Mandelbrot.vsh
diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Monjori.vsh b/samples/test-cpp/Resources/Shaders/example_Monjori.vsh
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Shaders/example_Monjori.vsh
rename to samples/test-cpp/Resources/Shaders/example_Monjori.vsh
diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Plasma.vsh b/samples/test-cpp/Resources/Shaders/example_Plasma.vsh
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Shaders/example_Plasma.vsh
rename to samples/test-cpp/Resources/Shaders/example_Plasma.vsh
diff --git a/samples/Cpp/TestCpp/Resources/Shaders/example_Twist.vsh b/samples/test-cpp/Resources/Shaders/example_Twist.vsh
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/Shaders/example_Twist.vsh
rename to samples/test-cpp/Resources/Shaders/example_Twist.vsh
diff --git a/samples/Cpp/TestCpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id b/samples/test-cpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id
rename to samples/test-cpp/Resources/TileMaps/hexa-tiles.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id b/samples/test-cpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id
rename to samples/test-cpp/Resources/TileMaps/map/slcj.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id b/samples/test-cpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id
rename to samples/test-cpp/Resources/TileMaps/ortho-test1.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id b/samples/test-cpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id
rename to samples/test-cpp/Resources/TileMaps/ortho-test1_bw.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/animations/grossini.plist.xml b/samples/test-cpp/Resources/animations/grossini.plist.xml
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/animations/grossini.plist.xml
rename to samples/test-cpp/Resources/animations/grossini.plist.xml
diff --git a/samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id b/samples/test-cpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id
rename to samples/test-cpp/Resources/armature/Cowboy.ExportJson.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/armature/Cowboy0.png.REMOVED.git-id b/samples/test-cpp/Resources/armature/Cowboy0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/armature/Cowboy0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/armature/Cowboy0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/armature/Dragon.xml b/samples/test-cpp/Resources/armature/Dragon.xml
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/armature/Dragon.xml
rename to samples/test-cpp/Resources/armature/Dragon.xml
diff --git a/samples/Cpp/TestCpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id b/samples/test-cpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id
rename to samples/test-cpp/Resources/armature/HeroAnimation.ExportJson.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/armature/cyborg.xml b/samples/test-cpp/Resources/armature/cyborg.xml
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/armature/cyborg.xml
rename to samples/test-cpp/Resources/armature/cyborg.xml
diff --git a/samples/Cpp/TestCpp/Resources/armature/knight.xml b/samples/test-cpp/Resources/armature/knight.xml
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/armature/knight.xml
rename to samples/test-cpp/Resources/armature/knight.xml
diff --git a/samples/Cpp/TestCpp/Resources/armature/robot.xml b/samples/test-cpp/Resources/armature/robot.xml
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/armature/robot.xml
rename to samples/test-cpp/Resources/armature/robot.xml
diff --git a/samples/Cpp/TestCpp/Resources/armature/weapon.xml b/samples/test-cpp/Resources/armature/weapon.xml
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/armature/weapon.xml
rename to samples/test-cpp/Resources/armature/weapon.xml
diff --git a/samples/Cpp/SimpleGame/Resources/background-music-aac.wav.REMOVED.git-id b/samples/test-cpp/Resources/background-music-aac.wav.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/SimpleGame/Resources/background-music-aac.wav.REMOVED.git-id
rename to samples/test-cpp/Resources/background-music-aac.wav.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/background.mp3.REMOVED.git-id b/samples/test-cpp/Resources/background.mp3.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/background.mp3.REMOVED.git-id
rename to samples/test-cpp/Resources/background.mp3.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/ccb/flower.jpg.REMOVED.git-id b/samples/test-cpp/Resources/ccb/flower.jpg.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/ccb/flower.jpg.REMOVED.git-id
rename to samples/test-cpp/Resources/ccb/flower.jpg.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/ccb/gem-0.wav.REMOVED.git-id b/samples/test-cpp/Resources/ccb/gem-0.wav.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/ccb/gem-0.wav.REMOVED.git-id
rename to samples/test-cpp/Resources/ccb/gem-0.wav.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/ccb/gem-1.wav.REMOVED.git-id b/samples/test-cpp/Resources/ccb/gem-1.wav.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/ccb/gem-1.wav.REMOVED.git-id
rename to samples/test-cpp/Resources/ccb/gem-1.wav.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id b/samples/test-cpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id
rename to samples/test-cpp/Resources/ccb/markerfelt24shadow.fnt.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/Hello.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/cocosgui/Hello.png.REMOVED.git-id
rename to samples/test-cpp/Resources/cocosgui/Hello.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id
rename to samples/test-cpp/Resources/cocosgui/UITest/background.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/b11.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/cocosgui/b11.png.REMOVED.git-id
rename to samples/test-cpp/Resources/cocosgui/b11.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id
rename to samples/test-cpp/Resources/cocosgui/bitmapFontTest2.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id
rename to samples/test-cpp/Resources/cocosgui/examples/examples.json.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
rename to samples/test-cpp/Resources/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/test-cpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
rename to samples/test-cpp/Resources/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/extensions/background.png.REMOVED.git-id b/samples/test-cpp/Resources/extensions/background.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/extensions/background.png.REMOVED.git-id
rename to samples/test-cpp/Resources/extensions/background.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/Courier New.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/Courier New.ttf.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/Courier New.ttf.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/Courier New.ttf.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/Thonburi.ttf.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/ThonburiBold.ttf.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/arial-26-en-ru_0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/arial-unicode-26.GlyphProject b/samples/test-cpp/Resources/fonts/arial-unicode-26.GlyphProject
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/arial-unicode-26.GlyphProject
rename to samples/test-cpp/Resources/fonts/arial-unicode-26.GlyphProject
diff --git a/samples/Cpp/TestCpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/arial-unicode-26.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/arial.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/arial.ttf.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/arial.ttf.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/arial.ttf.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/bitmapFontChinese.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/bitmapFontTest.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id b/samples/test-cpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/bitmapFontTest2.bmp.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/bitmapFontTest2.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/boundsTestFont.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/font-issue1343-hd.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/futura-48.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/futura-48.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/futura-48.png.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/futura-48.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id b/samples/test-cpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/helvetica-geneva-32.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id b/samples/test-cpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/markerFelt.fnt.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/strings.xml b/samples/test-cpp/Resources/fonts/strings.xml
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/strings.xml
rename to samples/test-cpp/Resources/fonts/strings.xml
diff --git a/samples/Cpp/TestCpp/Resources/fonts/tahoma.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/tahoma.ttf.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/tahoma.ttf.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/tahoma.ttf.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/fonts/wt021.ttf.REMOVED.git-id b/samples/test-cpp/Resources/fonts/wt021.ttf.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/fonts/wt021.ttf.REMOVED.git-id
rename to samples/test-cpp/Resources/fonts/wt021.ttf.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/Images/background1.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/Images/background1.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/Images/background1.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/Images/background1.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/Images/background2.jpg.REMOVED.git-id b/samples/test-cpp/Resources/hd/Images/background2.jpg.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/Images/background2.jpg.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/Images/background2.jpg.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/Images/background2.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/Images/background2.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/Images/background2.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/Images/background2.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/armature/Cowboy0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/armature/Dragon.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/armature/Dragon.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/armature/Dragon.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/armature/Dragon.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/armature/HeroAnimation0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/armature/weapon.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/armature/weapon.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/armature/weapon.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/armature/weapon.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/ccb/burst.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/ccb/burst.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/ccb/burst.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/ccb/burst.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/cocosgui/Hello.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/cocosgui/UITest/background.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/cocosgui/b11.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/cocosgui/bitmapFontTest2.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/cocosgui/examples/examples.json.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/cocosgui/gui_examples/map_1/map_pve.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/cocosgui/gui_examples/page_1/background.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/extensions/background.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/extensions/background.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/extensions/background.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/extensions/background.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/fonts/font-issue1343.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id b/samples/test-cpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/fonts/markerFelt.fnt.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/fonts/markerFelt.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/fonts/tuffy_bold_italic-charmap.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton01.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/starMenuButton02.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/spine/goblins.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/spine/goblins.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/spine/goblins.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/spine/goblins.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/hd/spine/spineboy.png.REMOVED.git-id b/samples/test-cpp/Resources/hd/spine/spineboy.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/hd/spine/spineboy.png.REMOVED.git-id
rename to samples/test-cpp/Resources/hd/spine/spineboy.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/ipad/ccb/burst.png.REMOVED.git-id b/samples/test-cpp/Resources/ipad/ccb/burst.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/ipad/ccb/burst.png.REMOVED.git-id
rename to samples/test-cpp/Resources/ipad/ccb/burst.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/ipad/extensions/background.png.REMOVED.git-id b/samples/test-cpp/Resources/ipad/extensions/background.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/ipad/extensions/background.png.REMOVED.git-id
rename to samples/test-cpp/Resources/ipad/extensions/background.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/ArmatureComponentTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/ArmatureComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/ArmatureComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.mp3.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/BackgroundComponentTest/Misc/music_logo.wav.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/BackgroundComponentTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy.ExportJson.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/EffectComponentTest/CowBoy/Cowboy0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.mp3.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/Misc/music_logo.wav.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/LoadSceneEdtiorFileTest/startMenu/Fish_UI/ui_logo_001-hd.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/TriggerTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/TriggerTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/TriggerTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/UIComponentTest/Images/startMenuBG.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/UIComponentTest/fishes/Butterflyfish/Butterflyfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id b/samples/test-cpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
rename to samples/test-cpp/Resources/scenetest/UIComponentTest/fishes/blowFish/Blowfish0.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/Resources/spine/goblins.png.REMOVED.git-id b/samples/test-cpp/Resources/spine/goblins.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/Resources/spine/goblins.png.REMOVED.git-id
rename to samples/test-cpp/Resources/spine/goblins.png.REMOVED.git-id
diff --git a/samples/Cpp/HelloCpp/proj.android/.classpath b/samples/test-cpp/proj.android/.classpath
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.android/.classpath
rename to samples/test-cpp/proj.android/.classpath
diff --git a/samples/Lua/HelloLua/proj.android/.project b/samples/test-cpp/proj.android/.project
similarity index 86%
rename from samples/Lua/HelloLua/proj.android/.project
rename to samples/test-cpp/proj.android/.project
index 2a61577d0c..3993dc62b8 100644
--- a/samples/Lua/HelloLua/proj.android/.project
+++ b/samples/test-cpp/proj.android/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>HelloLua</name>
+	<name>TestCpp</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -40,11 +40,4 @@
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>Resources</name>
-			<type>2</type>
-			<locationURI>PARENT-1-PROJECT_LOC/Resources</locationURI>
-		</link>
-	</linkedResources>
 </projectDescription>
diff --git a/samples/Cpp/TestCpp/proj.android/AndroidManifest.xml b/samples/test-cpp/proj.android/AndroidManifest.xml
similarity index 100%
rename from samples/Cpp/TestCpp/proj.android/AndroidManifest.xml
rename to samples/test-cpp/proj.android/AndroidManifest.xml
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/README.md b/samples/test-cpp/proj.android/README.md
similarity index 100%
rename from samples/Cpp/AssetsManagerTest/proj.android/README.md
rename to samples/test-cpp/proj.android/README.md
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/ant.properties b/samples/test-cpp/proj.android/ant.properties
similarity index 100%
rename from samples/Cpp/AssetsManagerTest/proj.android/ant.properties
rename to samples/test-cpp/proj.android/ant.properties
diff --git a/samples/Cpp/TestCpp/proj.android/build.xml b/samples/test-cpp/proj.android/build.xml
similarity index 100%
rename from samples/Cpp/TestCpp/proj.android/build.xml
rename to samples/test-cpp/proj.android/build.xml
diff --git a/samples/Cpp/TestCpp/proj.android/jni/Android.mk b/samples/test-cpp/proj.android/jni/Android.mk
similarity index 86%
rename from samples/Cpp/TestCpp/proj.android/jni/Android.mk
rename to samples/test-cpp/proj.android/jni/Android.mk
index 7867f3f1fb..ddcf40f4cc 100644
--- a/samples/Cpp/TestCpp/proj.android/jni/Android.mk
+++ b/samples/test-cpp/proj.android/jni/Android.mk
@@ -14,4 +14,4 @@ LOCAL_WHOLE_STATIC_LIBRARIES := cocos_testcpp_common
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module,samples/Cpp/TestCpp)
+$(call import-module,samples/test-cpp)
diff --git a/samples/Cpp/TestCpp/proj.android/jni/Application.mk b/samples/test-cpp/proj.android/jni/Application.mk
similarity index 100%
rename from samples/Cpp/TestCpp/proj.android/jni/Application.mk
rename to samples/test-cpp/proj.android/jni/Application.mk
diff --git a/samples/Cpp/TestCpp/proj.android/jni/testcpp/main.cpp b/samples/test-cpp/proj.android/jni/testcpp/main.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/proj.android/jni/testcpp/main.cpp
rename to samples/test-cpp/proj.android/jni/testcpp/main.cpp
diff --git a/samples/Cpp/TestCpp/proj.android/ndkgdb.sh b/samples/test-cpp/proj.android/ndkgdb.sh
similarity index 100%
rename from samples/Cpp/TestCpp/proj.android/ndkgdb.sh
rename to samples/test-cpp/proj.android/ndkgdb.sh
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/proguard-project.txt b/samples/test-cpp/proj.android/proguard-project.txt
similarity index 100%
rename from samples/Cpp/AssetsManagerTest/proj.android/proguard-project.txt
rename to samples/test-cpp/proj.android/proguard-project.txt
diff --git a/samples/Cpp/HelloCpp/proj.android/project.properties b/samples/test-cpp/proj.android/project.properties
similarity index 83%
rename from samples/Cpp/HelloCpp/proj.android/project.properties
rename to samples/test-cpp/proj.android/project.properties
index 0a6dc6664d..16f145cfc9 100644
--- a/samples/Cpp/HelloCpp/proj.android/project.properties
+++ b/samples/test-cpp/proj.android/project.properties
@@ -10,4 +10,4 @@
 # Project target.
 target=android-10
 
-android.library.reference.1=../../../../cocos/2d/platform/android/java
+android.library.reference.1=../../../cocos/2d/platform/android/java
diff --git a/samples/Cpp/TestCpp/proj.android/res/values/strings.xml b/samples/test-cpp/proj.android/res/values/strings.xml
similarity index 100%
rename from samples/Cpp/TestCpp/proj.android/res/values/strings.xml
rename to samples/test-cpp/proj.android/res/values/strings.xml
diff --git a/samples/Cpp/TestCpp/proj.android/src/nojava.txt b/samples/test-cpp/proj.android/src/nojava.txt
similarity index 100%
rename from samples/Cpp/TestCpp/proj.android/src/nojava.txt
rename to samples/test-cpp/proj.android/src/nojava.txt
diff --git a/samples/Cpp/TestCpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java b/samples/test-cpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java
similarity index 100%
rename from samples/Cpp/TestCpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java
rename to samples/test-cpp/proj.android/src/org/cocos2dx/testcpp/Cocos2dxActivity.java
diff --git a/samples/Cpp/TestCpp/proj.ios/Classes/RootViewController.h b/samples/test-cpp/proj.ios/Classes/RootViewController.h
similarity index 100%
rename from samples/Cpp/TestCpp/proj.ios/Classes/RootViewController.h
rename to samples/test-cpp/proj.ios/Classes/RootViewController.h
diff --git a/samples/Cpp/TestCpp/proj.ios/Classes/RootViewController.mm b/samples/test-cpp/proj.ios/Classes/RootViewController.mm
similarity index 100%
rename from samples/Cpp/TestCpp/proj.ios/Classes/RootViewController.mm
rename to samples/test-cpp/proj.ios/Classes/RootViewController.mm
diff --git a/samples/Cpp/TestCpp/proj.ios/Classes/testsAppDelegate.h b/samples/test-cpp/proj.ios/Classes/testsAppDelegate.h
similarity index 100%
rename from samples/Cpp/TestCpp/proj.ios/Classes/testsAppDelegate.h
rename to samples/test-cpp/proj.ios/Classes/testsAppDelegate.h
diff --git a/samples/Cpp/TestCpp/proj.ios/Classes/testsAppDelegate.mm b/samples/test-cpp/proj.ios/Classes/testsAppDelegate.mm
similarity index 100%
rename from samples/Cpp/TestCpp/proj.ios/Classes/testsAppDelegate.mm
rename to samples/test-cpp/proj.ios/Classes/testsAppDelegate.mm
diff --git a/samples/Cpp/HelloCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/test-cpp/proj.ios/Default-568h@2x.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id
rename to samples/test-cpp/proj.ios/Default-568h@2x.png.REMOVED.git-id
diff --git a/samples/Cpp/HelloCpp/proj.ios/Default@2x.png.REMOVED.git-id b/samples/test-cpp/proj.ios/Default@2x.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.ios/Default@2x.png.REMOVED.git-id
rename to samples/test-cpp/proj.ios/Default@2x.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/proj.ios/iphone_Prefix.pch b/samples/test-cpp/proj.ios/iphone_Prefix.pch
similarity index 100%
rename from samples/Cpp/TestCpp/proj.ios/iphone_Prefix.pch
rename to samples/test-cpp/proj.ios/iphone_Prefix.pch
diff --git a/samples/Cpp/TestCpp/proj.ios/main.m b/samples/test-cpp/proj.ios/main.m
similarity index 100%
rename from samples/Cpp/TestCpp/proj.ios/main.m
rename to samples/test-cpp/proj.ios/main.m
diff --git a/samples/Cpp/TestCpp/proj.linux/main.cpp b/samples/test-cpp/proj.linux/main.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/proj.linux/main.cpp
rename to samples/test-cpp/proj.linux/main.cpp
diff --git a/samples/Cpp/HelloCpp/proj.mac/Icon.icns.REMOVED.git-id b/samples/test-cpp/proj.mac/Icon.icns.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.mac/Icon.icns.REMOVED.git-id
rename to samples/test-cpp/proj.mac/Icon.icns.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/proj.mac/Test_Prefix.pch b/samples/test-cpp/proj.mac/Test_Prefix.pch
similarity index 100%
rename from samples/Cpp/TestCpp/proj.mac/Test_Prefix.pch
rename to samples/test-cpp/proj.mac/Test_Prefix.pch
diff --git a/samples/Cpp/HelloCpp/proj.mac/en.lproj/InfoPlist.strings b/samples/test-cpp/proj.mac/en.lproj/InfoPlist.strings
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.mac/en.lproj/InfoPlist.strings
rename to samples/test-cpp/proj.mac/en.lproj/InfoPlist.strings
diff --git a/samples/Cpp/TestCpp/proj.mac/en.lproj/MainMenu.xib b/samples/test-cpp/proj.mac/en.lproj/MainMenu.xib
similarity index 100%
rename from samples/Cpp/TestCpp/proj.mac/en.lproj/MainMenu.xib
rename to samples/test-cpp/proj.mac/en.lproj/MainMenu.xib
diff --git a/samples/Cpp/TestCpp/proj.mac/main.cpp b/samples/test-cpp/proj.mac/main.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/proj.mac/main.cpp
rename to samples/test-cpp/proj.mac/main.cpp
diff --git a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj b/samples/test-cpp/proj.win32/TestCpp.vcxproj
similarity index 96%
rename from samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
rename to samples/test-cpp/proj.win32/TestCpp.vcxproj
index 620b12b3f1..df8f3b6dc7 100644
--- a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
+++ b/samples/test-cpp/proj.win32/TestCpp.vcxproj
@@ -36,13 +36,13 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2d_headers.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2d_headers.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -94,7 +94,7 @@
     </PostBuildEvent>
     <PreLinkEvent>
       <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
 </Command>
     </PreLinkEvent>
   </ItemDefinitionGroup>
@@ -130,7 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
     </PostBuildEvent>
     <PreLinkEvent>
       <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
 </Command>
     </PreLinkEvent>
   </ItemDefinitionGroup>
@@ -485,41 +485,41 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
     <ClInclude Include="..\Classes\MutiTouchTest\MutiTouchTest.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\2d\cocos2d.vcxproj">
       <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
       <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
       <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
       <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
       <Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
       <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
       <Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
       <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
+    <ProjectReference Include="..\..\..\extensions\proj.win32\libExtensions.vcxproj">
       <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\Box2D\proj.win32\Box2D.vcxproj">
+    <ProjectReference Include="..\..\..\external\Box2D\proj.win32\Box2D.vcxproj">
       <Project>{929480e7-23c0-4df6-8456-096d71547116}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
+    <ProjectReference Include="..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
       <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters b/samples/test-cpp/proj.win32/TestCpp.vcxproj.filters
similarity index 100%
rename from samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
rename to samples/test-cpp/proj.win32/TestCpp.vcxproj.filters
diff --git a/samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.user b/samples/test-cpp/proj.win32/TestCpp.vcxproj.user
similarity index 100%
rename from samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.user
rename to samples/test-cpp/proj.win32/TestCpp.vcxproj.user
diff --git a/samples/Cpp/TestCpp/proj.win32/main.cpp b/samples/test-cpp/proj.win32/main.cpp
similarity index 100%
rename from samples/Cpp/TestCpp/proj.win32/main.cpp
rename to samples/test-cpp/proj.win32/main.cpp
diff --git a/samples/Cpp/HelloCpp/proj.win32/main.h b/samples/test-cpp/proj.win32/main.h
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.win32/main.h
rename to samples/test-cpp/proj.win32/main.h
diff --git a/samples/Javascript/TestJavascript/Classes/AppDelegate.cpp b/samples/test-javascript/Classes/AppDelegate.cpp
similarity index 100%
rename from samples/Javascript/TestJavascript/Classes/AppDelegate.cpp
rename to samples/test-javascript/Classes/AppDelegate.cpp
diff --git a/samples/Javascript/CocosDragonJS/Classes/AppDelegate.h b/samples/test-javascript/Classes/AppDelegate.h
similarity index 100%
rename from samples/Javascript/CocosDragonJS/Classes/AppDelegate.h
rename to samples/test-javascript/Classes/AppDelegate.h
diff --git a/samples/Cpp/AssetsManagerTest/proj.android/.classpath b/samples/test-javascript/proj.android/.classpath
similarity index 100%
rename from samples/Cpp/AssetsManagerTest/proj.android/.classpath
rename to samples/test-javascript/proj.android/.classpath
diff --git a/samples/Cpp/HelloCpp/proj.android/.project b/samples/test-javascript/proj.android/.project
similarity index 79%
rename from samples/Cpp/HelloCpp/proj.android/.project
rename to samples/test-javascript/proj.android/.project
index 908b979a53..f7677dbac4 100644
--- a/samples/Cpp/HelloCpp/proj.android/.project
+++ b/samples/test-javascript/proj.android/.project
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>HelloCpp</name>
+	<name>TestJavascript</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
 			<arguments>
@@ -39,22 +44,13 @@
 		<nature>org.eclipse.cdt.core.ccnature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
 		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
 	<linkedResources>
 		<link>
-			<name>Classes</name>
+			<name>scripting</name>
 			<type>2</type>
-			<locationURI>COCOS2DX/samples/Cpp/HelloCpp/Classes</locationURI>
-		</link>
-		<link>
-			<name>cocos2dx</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/cocos2dx</locationURI>
-		</link>
-		<link>
-			<name>extensions</name>
-			<type>2</type>
-			<locationURI>COCOS2DX/extensions</locationURI>
+			<locationURI>COCOS2DX/scripting</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/samples/Javascript/TestJavascript/proj.android/AndroidManifest.xml b/samples/test-javascript/proj.android/AndroidManifest.xml
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.android/AndroidManifest.xml
rename to samples/test-javascript/proj.android/AndroidManifest.xml
diff --git a/samples/Cpp/HelloCpp/proj.android/README.md b/samples/test-javascript/proj.android/README.md
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.android/README.md
rename to samples/test-javascript/proj.android/README.md
diff --git a/samples/Javascript/CocosDragonJS/proj.android/ant.properties b/samples/test-javascript/proj.android/ant.properties
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.android/ant.properties
rename to samples/test-javascript/proj.android/ant.properties
diff --git a/samples/Javascript/TestJavascript/proj.android/build.xml b/samples/test-javascript/proj.android/build.xml
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.android/build.xml
rename to samples/test-javascript/proj.android/build.xml
diff --git a/samples/Javascript/TestJavascript/proj.android/jni/Android.mk b/samples/test-javascript/proj.android/jni/Android.mk
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.android/jni/Android.mk
rename to samples/test-javascript/proj.android/jni/Android.mk
diff --git a/samples/Javascript/MoonWarriors/proj.android/jni/Application.mk b/samples/test-javascript/proj.android/jni/Application.mk
similarity index 100%
rename from samples/Javascript/MoonWarriors/proj.android/jni/Application.mk
rename to samples/test-javascript/proj.android/jni/Application.mk
diff --git a/samples/Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs/main.cpp b/samples/test-javascript/proj.android/jni/testjavascript/main.cpp
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs/main.cpp
rename to samples/test-javascript/proj.android/jni/testjavascript/main.cpp
diff --git a/samples/Javascript/TestJavascript/proj.android/ndkgdb.sh b/samples/test-javascript/proj.android/ndkgdb.sh
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.android/ndkgdb.sh
rename to samples/test-javascript/proj.android/ndkgdb.sh
diff --git a/samples/Cpp/SimpleGame/proj.android/proguard-project.txt b/samples/test-javascript/proj.android/proguard-project.txt
similarity index 100%
rename from samples/Cpp/SimpleGame/proj.android/proguard-project.txt
rename to samples/test-javascript/proj.android/proguard-project.txt
diff --git a/samples/Javascript/CocosDragonJS/proj.android/project.properties b/samples/test-javascript/proj.android/project.properties
similarity index 83%
rename from samples/Javascript/CocosDragonJS/proj.android/project.properties
rename to samples/test-javascript/proj.android/project.properties
index 0a6dc6664d..16f145cfc9 100644
--- a/samples/Javascript/CocosDragonJS/proj.android/project.properties
+++ b/samples/test-javascript/proj.android/project.properties
@@ -10,4 +10,4 @@
 # Project target.
 target=android-10
 
-android.library.reference.1=../../../../cocos/2d/platform/android/java
+android.library.reference.1=../../../cocos/2d/platform/android/java
diff --git a/samples/Javascript/TestJavascript/proj.android/res/values/strings.xml b/samples/test-javascript/proj.android/res/values/strings.xml
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.android/res/values/strings.xml
rename to samples/test-javascript/proj.android/res/values/strings.xml
diff --git a/samples/Javascript/TestJavascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java b/samples/test-javascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java
rename to samples/test-javascript/proj.android/src/org/cocos2dx/testjavascript/Cocos2dxActivity.java
diff --git a/samples/Javascript/CocosDragonJS/proj.ios/AppController.h b/samples/test-javascript/proj.ios/AppController.h
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.ios/AppController.h
rename to samples/test-javascript/proj.ios/AppController.h
diff --git a/samples/Javascript/TestJavascript/proj.ios/AppController.mm b/samples/test-javascript/proj.ios/AppController.mm
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.ios/AppController.mm
rename to samples/test-javascript/proj.ios/AppController.mm
diff --git a/samples/Cpp/SimpleGame/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/test-javascript/proj.ios/Default-568h@2x.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/SimpleGame/proj.ios/Default-568h@2x.png.REMOVED.git-id
rename to samples/test-javascript/proj.ios/Default-568h@2x.png.REMOVED.git-id
diff --git a/samples/Cpp/SimpleGame/proj.ios/Default@2x.png.REMOVED.git-id b/samples/test-javascript/proj.ios/Default@2x.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/SimpleGame/proj.ios/Default@2x.png.REMOVED.git-id
rename to samples/test-javascript/proj.ios/Default@2x.png.REMOVED.git-id
diff --git a/samples/Javascript/CocosDragonJS/proj.ios/Prefix.pch b/samples/test-javascript/proj.ios/Prefix.pch
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.ios/Prefix.pch
rename to samples/test-javascript/proj.ios/Prefix.pch
diff --git a/samples/Cpp/HelloCpp/proj.ios/RootViewController.h b/samples/test-javascript/proj.ios/RootViewController.h
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.ios/RootViewController.h
rename to samples/test-javascript/proj.ios/RootViewController.h
diff --git a/samples/Javascript/CocosDragonJS/proj.ios/RootViewController.mm b/samples/test-javascript/proj.ios/RootViewController.mm
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.ios/RootViewController.mm
rename to samples/test-javascript/proj.ios/RootViewController.mm
diff --git a/samples/Javascript/CocosDragonJS/proj.ios/main.m b/samples/test-javascript/proj.ios/main.m
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.ios/main.m
rename to samples/test-javascript/proj.ios/main.m
diff --git a/samples/Cpp/SimpleGame/proj.mac/Icon.icns.REMOVED.git-id b/samples/test-javascript/proj.mac/Icon.icns.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/SimpleGame/proj.mac/Icon.icns.REMOVED.git-id
rename to samples/test-javascript/proj.mac/Icon.icns.REMOVED.git-id
diff --git a/samples/Javascript/TestJavascript/proj.mac/Test_Prefix.pch b/samples/test-javascript/proj.mac/Test_Prefix.pch
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.mac/Test_Prefix.pch
rename to samples/test-javascript/proj.mac/Test_Prefix.pch
diff --git a/samples/Cpp/SimpleGame/proj.mac/en.lproj/InfoPlist.strings b/samples/test-javascript/proj.mac/en.lproj/InfoPlist.strings
similarity index 100%
rename from samples/Cpp/SimpleGame/proj.mac/en.lproj/InfoPlist.strings
rename to samples/test-javascript/proj.mac/en.lproj/InfoPlist.strings
diff --git a/samples/Javascript/CocosDragonJS/proj.mac/en.lproj/MainMenu.xib b/samples/test-javascript/proj.mac/en.lproj/MainMenu.xib
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.mac/en.lproj/MainMenu.xib
rename to samples/test-javascript/proj.mac/en.lproj/MainMenu.xib
diff --git a/samples/Javascript/TestJavascript/proj.mac/main.cpp b/samples/test-javascript/proj.mac/main.cpp
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.mac/main.cpp
rename to samples/test-javascript/proj.mac/main.cpp
diff --git a/samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj b/samples/test-javascript/proj.win32/TestJavascript.vcxproj
similarity index 80%
rename from samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
rename to samples/test-javascript/proj.win32/TestJavascript.vcxproj
index e3be6f4245..5319580d2a 100644
--- a/samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
+++ b/samples/test-javascript/proj.win32/TestJavascript.vcxproj
@@ -34,13 +34,13 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2d_headers.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2d_headers.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -98,8 +98,8 @@
     </ResourceCompile>
     <PreLinkEvent>
       <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
 </Command>
     </PreLinkEvent>
     <Link>
@@ -113,8 +113,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
       <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
 if exist "$(OutDir)\TestJavascriptRes" rd /s /q "$(OutDir)\TestJavascriptRes"
 mkdir "$(OutDir)\TestJavascriptRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\TestJavascriptRes\" /e /Y</Command>
+xcopy "$(ProjectDir)..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y
+xcopy "$(ProjectDir)..\tests" "$(OutDir)\TestJavascriptRes\" /e /Y</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Copy js and resource files.</Message>
@@ -154,8 +154,8 @@ xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\TestJavascriptRes\" /e /Y</Co
     </ResourceCompile>
     <PreLinkEvent>
       <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\..\external\spidermonkey\prebuilt\win32\*.*" "$(OutDir)"
+xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"
 </Command>
     </PreLinkEvent>
     <Link>
@@ -169,8 +169,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
       <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
 if exist "$(OutDir)\TestJavascriptRes" rd /s /q "$(OutDir)\TestJavascriptRes"
 mkdir "$(OutDir)\TestJavascriptRes"
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y
-xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\TestJavascriptRes\" /e /Y</Command>
+xcopy "$(ProjectDir)..\..\..\cocos\scripting\javascript\script\*.js" "$(OutDir)\TestJavascriptRes\" /e /Y
+xcopy "$(ProjectDir)..\tests" "$(OutDir)\TestJavascriptRes\" /e /Y</Command>
       <Message>Copy js and resource files.</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -190,66 +190,66 @@ xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\TestJavascriptRes\" /e /Y</Co
     <ResourceCompile Include="testjs.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\2d\cocos2d.vcxproj">
       <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
       <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
       <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
       <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
       <Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
       <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
       <Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\chipmunk\libJSBindingForChipmunk.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\javascript\bindings\chipmunk\libJSBindingForChipmunk.vcxproj">
       <Project>{21070e58-eec6-4e16-8b4f-6d083df55790}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\javascript\bindings\cocosbuilder\libJSBindingForBuilder.vcxproj">
       <Project>{f9da0fc1-651b-457b-962e-a4d61cebf5fd}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\cocostudio\libJSBindingForStudio.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\javascript\bindings\cocostudio\libJSBindingForStudio.vcxproj">
       <Project>{79d34511-e54e-410a-8bba-ef175ad6c695}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\extension\libJSBindingForExtension.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\javascript\bindings\extension\libJSBindingForExtension.vcxproj">
       <Project>{625f7391-9a91-48a1-8cfc-79508c822637}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\gui\libJSBindingForGui.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\javascript\bindings\gui\libJSBindingForGui.vcxproj">
       <Project>{9a844c88-97e8-4e2d-b09a-e138c67d338b}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\localstorage\libJSBindingForLocalStorage.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\javascript\bindings\localstorage\libJSBindingForLocalStorage.vcxproj">
       <Project>{68f5f371-bd7b-4c30-ae5b-0b08f22e0cde}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\network\libJSBindingForNetwork.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\javascript\bindings\network\libJSBindingForNetwork.vcxproj">
       <Project>{3bec13f5-e227-4d80-bc77-1c857f83bcfc}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\javascript\bindings\proj.win32\libJSBinding.vcxproj">
       <Project>{39379840-825a-45a0-b363-c09ffef864bd}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\javascript\bindings\spine\libJSBindingForSpine.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\javascript\bindings\spine\libJSBindingForSpine.vcxproj">
       <Project>{e78cdc6b-f37d-48d2-ad91-1db549497e32}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
       <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
+    <ProjectReference Include="..\..\..\extensions\proj.win32\libExtensions.vcxproj">
       <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\Box2D\proj.win32\Box2D.vcxproj">
+    <ProjectReference Include="..\..\..\external\Box2D\proj.win32\Box2D.vcxproj">
       <Project>{929480e7-23c0-4df6-8456-096d71547116}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
+    <ProjectReference Include="..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
       <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj.filters b/samples/test-javascript/proj.win32/TestJavascript.vcxproj.filters
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj.filters
rename to samples/test-javascript/proj.win32/TestJavascript.vcxproj.filters
diff --git a/samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj.user b/samples/test-javascript/proj.win32/TestJavascript.vcxproj.user
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj.user
rename to samples/test-javascript/proj.win32/TestJavascript.vcxproj.user
diff --git a/samples/Javascript/TestJavascript/proj.win32/main.cpp b/samples/test-javascript/proj.win32/main.cpp
similarity index 100%
rename from samples/Javascript/TestJavascript/proj.win32/main.cpp
rename to samples/test-javascript/proj.win32/main.cpp
diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/main.h b/samples/test-javascript/proj.win32/main.h
similarity index 100%
rename from samples/Cpp/AssetsManagerTest/proj.win32/main.h
rename to samples/test-javascript/proj.win32/main.h
diff --git a/samples/Javascript/CocosDragonJS/proj.win32/res/testjs.ico b/samples/test-javascript/proj.win32/res/testjs.ico
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.win32/res/testjs.ico
rename to samples/test-javascript/proj.win32/res/testjs.ico
diff --git a/samples/Cpp/AssetsManagerTest/proj.win32/resource.h b/samples/test-javascript/proj.win32/resource.h
similarity index 100%
rename from samples/Cpp/AssetsManagerTest/proj.win32/resource.h
rename to samples/test-javascript/proj.win32/resource.h
diff --git a/samples/Javascript/CocosDragonJS/proj.win32/testjs.rc b/samples/test-javascript/proj.win32/testjs.rc
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.win32/testjs.rc
rename to samples/test-javascript/proj.win32/testjs.rc
diff --git a/samples/test-javascript/tests b/samples/test-javascript/tests
new file mode 160000
index 0000000000..7a9a69a414
--- /dev/null
+++ b/samples/test-javascript/tests
@@ -0,0 +1 @@
+Subproject commit 7a9a69a41480127a1572a4983eb9b5f1cbf2e186
diff --git a/samples/Lua/TestLua/.gitignore b/samples/test-lua/.gitignore
similarity index 100%
rename from samples/Lua/TestLua/.gitignore
rename to samples/test-lua/.gitignore
diff --git a/samples/Lua/TestLua/CMakeLists.txt b/samples/test-lua/CMakeLists.txt
similarity index 84%
rename from samples/Lua/TestLua/CMakeLists.txt
rename to samples/test-lua/CMakeLists.txt
index bc9427168f..4c75d70b40 100644
--- a/samples/Lua/TestLua/CMakeLists.txt
+++ b/samples/test-lua/CMakeLists.txt
@@ -7,9 +7,9 @@ set(SAMPLE_SRC
 
 include_directories(
   Classes
-  ../../../cocos/scripting/lua/bindings
-  ../../../external/lua/lua
-  ../../../external/lua/tolua
+  ../../cocos/scripting/lua/bindings
+  ../../external/lua/lua
+  ../../external/lua/tolua
 )
 
 # add the executable
@@ -37,6 +37,6 @@ pre_build(${APP_NAME}
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/Resources ${APP_BIN_DIR}/Resources
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/cocos/scripting/lua/script ${APP_BIN_DIR}/Resources
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/samples/Cpp/TestCpp/Resources ${APP_BIN_DIR}/Resources
+  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/samples/test-cpp/Resources ${APP_BIN_DIR}/Resources
   )
 
diff --git a/samples/Lua/TestLua/Classes/AppDelegate.cpp b/samples/test-lua/Classes/AppDelegate.cpp
similarity index 100%
rename from samples/Lua/TestLua/Classes/AppDelegate.cpp
rename to samples/test-lua/Classes/AppDelegate.cpp
diff --git a/samples/Lua/TestLua/Classes/AppDelegate.h b/samples/test-lua/Classes/AppDelegate.h
similarity index 100%
rename from samples/Lua/TestLua/Classes/AppDelegate.h
rename to samples/test-lua/Classes/AppDelegate.h
diff --git a/samples/Lua/TestLua/Classes/lua_assetsmanager_test_sample.cpp b/samples/test-lua/Classes/lua_assetsmanager_test_sample.cpp
similarity index 100%
rename from samples/Lua/TestLua/Classes/lua_assetsmanager_test_sample.cpp
rename to samples/test-lua/Classes/lua_assetsmanager_test_sample.cpp
diff --git a/samples/Lua/TestLua/Classes/lua_assetsmanager_test_sample.h b/samples/test-lua/Classes/lua_assetsmanager_test_sample.h
similarity index 100%
rename from samples/Lua/TestLua/Classes/lua_assetsmanager_test_sample.h
rename to samples/test-lua/Classes/lua_assetsmanager_test_sample.h
diff --git a/samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id b/samples/test-lua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id
similarity index 100%
rename from samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id
rename to samples/test-lua/Resources/cocosbuilderRes/ccb/flower.jpg.REMOVED.git-id
diff --git a/samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id b/samples/test-lua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id
similarity index 100%
rename from samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id
rename to samples/test-lua/Resources/cocosbuilderRes/ccb/gem-0.wav.REMOVED.git-id
diff --git a/samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id b/samples/test-lua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id
similarity index 100%
rename from samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id
rename to samples/test-lua/Resources/cocosbuilderRes/ccb/gem-1.wav.REMOVED.git-id
diff --git a/samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id b/samples/test-lua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id
similarity index 100%
rename from samples/Lua/TestLua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id
rename to samples/test-lua/Resources/cocosbuilderRes/ccb/markerfelt24shadow.fnt.REMOVED.git-id
diff --git a/samples/Lua/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua b/samples/test-lua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua
rename to samples/test-lua/Resources/luaScript/AccelerometerTest/AccelerometerTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua b/samples/test-lua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua
rename to samples/test-lua/Resources/luaScript/ActionManagerTest/ActionManagerTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua b/samples/test-lua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua
rename to samples/test-lua/Resources/luaScript/ActionsEaseTest/ActionsEaseTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua b/samples/test-lua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua
rename to samples/test-lua/Resources/luaScript/ActionsProgressTest/ActionsProgressTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua b/samples/test-lua/Resources/luaScript/ActionsTest/ActionsTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ActionsTest/ActionsTest.lua
rename to samples/test-lua/Resources/luaScript/ActionsTest/ActionsTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua b/samples/test-lua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua
rename to samples/test-lua/Resources/luaScript/AssetsManagerTest/AssetsManagerModule.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua b/samples/test-lua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua
rename to samples/test-lua/Resources/luaScript/AssetsManagerTest/AssetsManagerTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/BugsTest/BugsTest.lua b/samples/test-lua/Resources/luaScript/BugsTest/BugsTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/BugsTest/BugsTest.lua
rename to samples/test-lua/Resources/luaScript/BugsTest/BugsTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua b/samples/test-lua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua
rename to samples/test-lua/Resources/luaScript/ClickAndMoveTest/ClickAndMoveTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id
rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioGUITest/CocoStudioGUITest.lua.REMOVED.git-id
diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua
rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/CocoStudioSceneTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua
rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/acts.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua
rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/cons.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua
rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioSceneTest/TriggerCode/eventDef.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua b/samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua
rename to samples/test-lua/Resources/luaScript/CocoStudioTest/CocoStudioTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua b/samples/test-lua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua
rename to samples/test-lua/Resources/luaScript/CocosDenshionTest/CocosDenshionTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua b/samples/test-lua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua
rename to samples/test-lua/Resources/luaScript/CurrentLanguageTest/CurrentLanguageTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua b/samples/test-lua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua
rename to samples/test-lua/Resources/luaScript/DrawPrimitivesTest/DrawPrimitivesTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua b/samples/test-lua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua
rename to samples/test-lua/Resources/luaScript/EffectsAdvancedTest/EffectsAdvancedTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/EffectsTest/EffectsName.lua b/samples/test-lua/Resources/luaScript/EffectsTest/EffectsName.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/EffectsTest/EffectsName.lua
rename to samples/test-lua/Resources/luaScript/EffectsTest/EffectsName.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/EffectsTest/EffectsTest.lua b/samples/test-lua/Resources/luaScript/EffectsTest/EffectsTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/EffectsTest/EffectsTest.lua
rename to samples/test-lua/Resources/luaScript/EffectsTest/EffectsTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua b/samples/test-lua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua
rename to samples/test-lua/Resources/luaScript/ExtensionTest/CocosBuilderTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua b/samples/test-lua/Resources/luaScript/ExtensionTest/ExtensionTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ExtensionTest/ExtensionTest.lua
rename to samples/test-lua/Resources/luaScript/ExtensionTest/ExtensionTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ExtensionTest/WebProxyTest.lua b/samples/test-lua/Resources/luaScript/ExtensionTest/WebProxyTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ExtensionTest/WebProxyTest.lua
rename to samples/test-lua/Resources/luaScript/ExtensionTest/WebProxyTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/FontTest/FontTest.lua b/samples/test-lua/Resources/luaScript/FontTest/FontTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/FontTest/FontTest.lua
rename to samples/test-lua/Resources/luaScript/FontTest/FontTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/IntervalTest/IntervalTest.lua b/samples/test-lua/Resources/luaScript/IntervalTest/IntervalTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/IntervalTest/IntervalTest.lua
rename to samples/test-lua/Resources/luaScript/IntervalTest/IntervalTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/KeypadTest/KeypadTest.lua b/samples/test-lua/Resources/luaScript/KeypadTest/KeypadTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/KeypadTest/KeypadTest.lua
rename to samples/test-lua/Resources/luaScript/KeypadTest/KeypadTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/LabelTest/LabelTest.lua b/samples/test-lua/Resources/luaScript/LabelTest/LabelTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/LabelTest/LabelTest.lua
rename to samples/test-lua/Resources/luaScript/LabelTest/LabelTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/LabelTestNew/LabelTestNew.lua b/samples/test-lua/Resources/luaScript/LabelTestNew/LabelTestNew.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/LabelTestNew/LabelTestNew.lua
rename to samples/test-lua/Resources/luaScript/LabelTestNew/LabelTestNew.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/LayerTest/LayerTest.lua b/samples/test-lua/Resources/luaScript/LayerTest/LayerTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/LayerTest/LayerTest.lua
rename to samples/test-lua/Resources/luaScript/LayerTest/LayerTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua b/samples/test-lua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua
rename to samples/test-lua/Resources/luaScript/LuaBridgeTest/LuaBridgeTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/MenuTest/MenuTest.lua b/samples/test-lua/Resources/luaScript/MenuTest/MenuTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/MenuTest/MenuTest.lua
rename to samples/test-lua/Resources/luaScript/MenuTest/MenuTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua b/samples/test-lua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua
rename to samples/test-lua/Resources/luaScript/MotionStreakTest/MotionStreakTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua b/samples/test-lua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua
rename to samples/test-lua/Resources/luaScript/NewEventDispatcherTest/NewEventDispatcherTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/NodeTest/NodeTest.lua b/samples/test-lua/Resources/luaScript/NodeTest/NodeTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/NodeTest/NodeTest.lua
rename to samples/test-lua/Resources/luaScript/NodeTest/NodeTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/OpenGLTest/OpenGLTest.lua b/samples/test-lua/Resources/luaScript/OpenGLTest/OpenGLTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/OpenGLTest/OpenGLTest.lua
rename to samples/test-lua/Resources/luaScript/OpenGLTest/OpenGLTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ParallaxTest/ParallaxTest.lua b/samples/test-lua/Resources/luaScript/ParallaxTest/ParallaxTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ParallaxTest/ParallaxTest.lua
rename to samples/test-lua/Resources/luaScript/ParallaxTest/ParallaxTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua b/samples/test-lua/Resources/luaScript/ParticleTest/ParticleTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ParticleTest/ParticleTest.lua
rename to samples/test-lua/Resources/luaScript/ParticleTest/ParticleTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua b/samples/test-lua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua
rename to samples/test-lua/Resources/luaScript/PerformanceTest/PerformanceSpriteTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/PerformanceTest/PerformanceTest.lua b/samples/test-lua/Resources/luaScript/PerformanceTest/PerformanceTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/PerformanceTest/PerformanceTest.lua
rename to samples/test-lua/Resources/luaScript/PerformanceTest/PerformanceTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua b/samples/test-lua/Resources/luaScript/PhysicsTest/PhysicsTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/PhysicsTest/PhysicsTest.lua
rename to samples/test-lua/Resources/luaScript/PhysicsTest/PhysicsTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua b/samples/test-lua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua
rename to samples/test-lua/Resources/luaScript/RenderTextureTest/RenderTextureTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua b/samples/test-lua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua
rename to samples/test-lua/Resources/luaScript/RotateWorldTest/RotateWorldTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/SceneTest/SceneTest.lua b/samples/test-lua/Resources/luaScript/SceneTest/SceneTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/SceneTest/SceneTest.lua
rename to samples/test-lua/Resources/luaScript/SceneTest/SceneTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/SpineTest/SpineTest.lua b/samples/test-lua/Resources/luaScript/SpineTest/SpineTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/SpineTest/SpineTest.lua
rename to samples/test-lua/Resources/luaScript/SpineTest/SpineTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/SpriteTest/SpriteTest.lua b/samples/test-lua/Resources/luaScript/SpriteTest/SpriteTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/SpriteTest/SpriteTest.lua
rename to samples/test-lua/Resources/luaScript/SpriteTest/SpriteTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/Texture2dTest/Texture2dTest.lua b/samples/test-lua/Resources/luaScript/Texture2dTest/Texture2dTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/Texture2dTest/Texture2dTest.lua
rename to samples/test-lua/Resources/luaScript/Texture2dTest/Texture2dTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua b/samples/test-lua/Resources/luaScript/TileMapTest/TileMapTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/TileMapTest/TileMapTest.lua
rename to samples/test-lua/Resources/luaScript/TileMapTest/TileMapTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/TouchesTest/Ball.lua b/samples/test-lua/Resources/luaScript/TouchesTest/Ball.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/TouchesTest/Ball.lua
rename to samples/test-lua/Resources/luaScript/TouchesTest/Ball.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/TouchesTest/Paddle.lua b/samples/test-lua/Resources/luaScript/TouchesTest/Paddle.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/TouchesTest/Paddle.lua
rename to samples/test-lua/Resources/luaScript/TouchesTest/Paddle.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/TouchesTest/TouchesTest.lua b/samples/test-lua/Resources/luaScript/TouchesTest/TouchesTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/TouchesTest/TouchesTest.lua
rename to samples/test-lua/Resources/luaScript/TouchesTest/TouchesTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/TransitionsTest/TransitionsName.lua b/samples/test-lua/Resources/luaScript/TransitionsTest/TransitionsName.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/TransitionsTest/TransitionsName.lua
rename to samples/test-lua/Resources/luaScript/TransitionsTest/TransitionsName.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua b/samples/test-lua/Resources/luaScript/TransitionsTest/TransitionsTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/TransitionsTest/TransitionsTest.lua
rename to samples/test-lua/Resources/luaScript/TransitionsTest/TransitionsTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua b/samples/test-lua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua
rename to samples/test-lua/Resources/luaScript/UserDefaultTest/UserDefaultTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/VisibleRect.lua b/samples/test-lua/Resources/luaScript/VisibleRect.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/VisibleRect.lua
rename to samples/test-lua/Resources/luaScript/VisibleRect.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua b/samples/test-lua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua
rename to samples/test-lua/Resources/luaScript/XMLHttpRequestTest/XMLHttpRequestTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua b/samples/test-lua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua
rename to samples/test-lua/Resources/luaScript/ZwoptexTest/ZwoptexTest.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/controller.lua b/samples/test-lua/Resources/luaScript/controller.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/controller.lua
rename to samples/test-lua/Resources/luaScript/controller.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/helper.lua b/samples/test-lua/Resources/luaScript/helper.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/helper.lua
rename to samples/test-lua/Resources/luaScript/helper.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/mainMenu.lua b/samples/test-lua/Resources/luaScript/mainMenu.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
rename to samples/test-lua/Resources/luaScript/mainMenu.lua
diff --git a/samples/Lua/TestLua/Resources/luaScript/testResource.lua b/samples/test-lua/Resources/luaScript/testResource.lua
similarity index 100%
rename from samples/Lua/TestLua/Resources/luaScript/testResource.lua
rename to samples/test-lua/Resources/luaScript/testResource.lua
diff --git a/samples/Javascript/CocosDragonJS/proj.android/.classpath b/samples/test-lua/proj.android/.classpath
similarity index 100%
rename from samples/Javascript/CocosDragonJS/proj.android/.classpath
rename to samples/test-lua/proj.android/.classpath
diff --git a/samples/Lua/TestLua/proj.android/.project b/samples/test-lua/proj.android/.project
similarity index 100%
rename from samples/Lua/TestLua/proj.android/.project
rename to samples/test-lua/proj.android/.project
diff --git a/samples/Lua/TestLua/proj.android/AndroidManifest.xml b/samples/test-lua/proj.android/AndroidManifest.xml
similarity index 100%
rename from samples/Lua/TestLua/proj.android/AndroidManifest.xml
rename to samples/test-lua/proj.android/AndroidManifest.xml
diff --git a/samples/Cpp/SimpleGame/proj.android/ant.properties b/samples/test-lua/proj.android/ant.properties
similarity index 100%
rename from samples/Cpp/SimpleGame/proj.android/ant.properties
rename to samples/test-lua/proj.android/ant.properties
diff --git a/samples/Lua/TestLua/proj.android/build.xml b/samples/test-lua/proj.android/build.xml
similarity index 100%
rename from samples/Lua/TestLua/proj.android/build.xml
rename to samples/test-lua/proj.android/build.xml
diff --git a/samples/Lua/TestLua/proj.android/jni/Android.mk b/samples/test-lua/proj.android/jni/Android.mk
similarity index 70%
rename from samples/Lua/TestLua/proj.android/jni/Android.mk
rename to samples/test-lua/proj.android/jni/Android.mk
index 4bc4ceafb3..e75e0de694 100644
--- a/samples/Lua/TestLua/proj.android/jni/Android.mk
+++ b/samples/test-lua/proj.android/jni/Android.mk
@@ -12,9 +12,9 @@ LOCAL_SRC_FILES += testlua/main.cpp \
 
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../Classes \
-                    $(LOCAL_PATH)/../../../../../external/lua/tolua \
-                    $(LOCAL_PATH)/../../../../../extensions \
-                    $(LOCAL_PATH)/../../../../../cocos/scripting/lua/bindings
+                    $(LOCAL_PATH)/../../../../external/lua/tolua \
+                    $(LOCAL_PATH)/../../../../extensions \
+                    $(LOCAL_PATH)/../../../../cocos/scripting/lua/bindings
 
 
 LOCAL_STATIC_LIBRARIES := curl_static_prebuilt
diff --git a/samples/Lua/TestLua/proj.android/jni/Application.mk b/samples/test-lua/proj.android/jni/Application.mk
similarity index 100%
rename from samples/Lua/TestLua/proj.android/jni/Application.mk
rename to samples/test-lua/proj.android/jni/Application.mk
diff --git a/samples/Lua/TestLua/proj.android/jni/testlua/main.cpp b/samples/test-lua/proj.android/jni/testlua/main.cpp
similarity index 100%
rename from samples/Lua/TestLua/proj.android/jni/testlua/main.cpp
rename to samples/test-lua/proj.android/jni/testlua/main.cpp
diff --git a/samples/Cpp/TestCpp/proj.android/proguard-project.txt b/samples/test-lua/proj.android/proguard-project.txt
similarity index 100%
rename from samples/Cpp/TestCpp/proj.android/proguard-project.txt
rename to samples/test-lua/proj.android/proguard-project.txt
diff --git a/samples/Cpp/TestCpp/proj.android/project.properties b/samples/test-lua/proj.android/project.properties
similarity index 83%
rename from samples/Cpp/TestCpp/proj.android/project.properties
rename to samples/test-lua/proj.android/project.properties
index 0a6dc6664d..16f145cfc9 100644
--- a/samples/Cpp/TestCpp/proj.android/project.properties
+++ b/samples/test-lua/proj.android/project.properties
@@ -10,4 +10,4 @@
 # Project target.
 target=android-10
 
-android.library.reference.1=../../../../cocos/2d/platform/android/java
+android.library.reference.1=../../../cocos/2d/platform/android/java
diff --git a/samples/Lua/TestLua/proj.android/res/values/strings.xml b/samples/test-lua/proj.android/res/values/strings.xml
similarity index 100%
rename from samples/Lua/TestLua/proj.android/res/values/strings.xml
rename to samples/test-lua/proj.android/res/values/strings.xml
diff --git a/samples/Lua/TestLua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java b/samples/test-lua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java
similarity index 100%
rename from samples/Lua/TestLua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java
rename to samples/test-lua/proj.android/src/com/cocos2dx/sample/LuaJavaBridgeTest/LuaJavaBridgeTest.java
diff --git a/samples/Lua/TestLua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java b/samples/test-lua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java
similarity index 100%
rename from samples/Lua/TestLua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java
rename to samples/test-lua/proj.android/src/org/cocos2dx/testlua/Cocos2dxActivity.java
diff --git a/samples/Cpp/HelloCpp/proj.ios/AppController.h b/samples/test-lua/proj.ios/AppController.h
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.ios/AppController.h
rename to samples/test-lua/proj.ios/AppController.h
diff --git a/samples/Lua/TestLua/proj.ios/AppController.mm b/samples/test-lua/proj.ios/AppController.mm
similarity index 100%
rename from samples/Lua/TestLua/proj.ios/AppController.mm
rename to samples/test-lua/proj.ios/AppController.mm
diff --git a/samples/Cpp/TestCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id b/samples/test-lua/proj.ios/Default-568h@2x.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/proj.ios/Default-568h@2x.png.REMOVED.git-id
rename to samples/test-lua/proj.ios/Default-568h@2x.png.REMOVED.git-id
diff --git a/samples/Cpp/TestCpp/proj.ios/Default@2x.png.REMOVED.git-id b/samples/test-lua/proj.ios/Default@2x.png.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/proj.ios/Default@2x.png.REMOVED.git-id
rename to samples/test-lua/proj.ios/Default@2x.png.REMOVED.git-id
diff --git a/samples/Lua/TestLua/proj.ios/LuaObjectCBridgeTest.h b/samples/test-lua/proj.ios/LuaObjectCBridgeTest.h
similarity index 100%
rename from samples/Lua/TestLua/proj.ios/LuaObjectCBridgeTest.h
rename to samples/test-lua/proj.ios/LuaObjectCBridgeTest.h
diff --git a/samples/Lua/TestLua/proj.ios/LuaObjectCBridgeTest.mm b/samples/test-lua/proj.ios/LuaObjectCBridgeTest.mm
similarity index 100%
rename from samples/Lua/TestLua/proj.ios/LuaObjectCBridgeTest.mm
rename to samples/test-lua/proj.ios/LuaObjectCBridgeTest.mm
diff --git a/samples/Cpp/SimpleGame/proj.ios/RootViewController.h b/samples/test-lua/proj.ios/RootViewController.h
similarity index 100%
rename from samples/Cpp/SimpleGame/proj.ios/RootViewController.h
rename to samples/test-lua/proj.ios/RootViewController.h
diff --git a/samples/Cpp/SimpleGame/proj.ios/RootViewController.mm b/samples/test-lua/proj.ios/RootViewController.mm
similarity index 100%
rename from samples/Cpp/SimpleGame/proj.ios/RootViewController.mm
rename to samples/test-lua/proj.ios/RootViewController.mm
diff --git a/samples/Lua/TestLua/proj.ios/TestLua_Prefix.pch b/samples/test-lua/proj.ios/TestLua_Prefix.pch
similarity index 100%
rename from samples/Lua/TestLua/proj.ios/TestLua_Prefix.pch
rename to samples/test-lua/proj.ios/TestLua_Prefix.pch
diff --git a/samples/Lua/TestLua/proj.ios/main.m b/samples/test-lua/proj.ios/main.m
similarity index 100%
rename from samples/Lua/TestLua/proj.ios/main.m
rename to samples/test-lua/proj.ios/main.m
diff --git a/samples/Lua/TestLua/proj.linux/main.cpp b/samples/test-lua/proj.linux/main.cpp
similarity index 100%
rename from samples/Lua/TestLua/proj.linux/main.cpp
rename to samples/test-lua/proj.linux/main.cpp
diff --git a/samples/Cpp/TestCpp/proj.mac/Icon.icns.REMOVED.git-id b/samples/test-lua/proj.mac/Icon.icns.REMOVED.git-id
similarity index 100%
rename from samples/Cpp/TestCpp/proj.mac/Icon.icns.REMOVED.git-id
rename to samples/test-lua/proj.mac/Icon.icns.REMOVED.git-id
diff --git a/samples/Lua/TestLua/proj.mac/LuaObjectCBridgeTest.h b/samples/test-lua/proj.mac/LuaObjectCBridgeTest.h
similarity index 100%
rename from samples/Lua/TestLua/proj.mac/LuaObjectCBridgeTest.h
rename to samples/test-lua/proj.mac/LuaObjectCBridgeTest.h
diff --git a/samples/Lua/TestLua/proj.mac/LuaObjectCBridgeTest.mm b/samples/test-lua/proj.mac/LuaObjectCBridgeTest.mm
similarity index 100%
rename from samples/Lua/TestLua/proj.mac/LuaObjectCBridgeTest.mm
rename to samples/test-lua/proj.mac/LuaObjectCBridgeTest.mm
diff --git a/samples/Lua/TestLua/proj.mac/TestLua_Prefix.pch b/samples/test-lua/proj.mac/TestLua_Prefix.pch
similarity index 100%
rename from samples/Lua/TestLua/proj.mac/TestLua_Prefix.pch
rename to samples/test-lua/proj.mac/TestLua_Prefix.pch
diff --git a/samples/Cpp/TestCpp/proj.mac/en.lproj/InfoPlist.strings b/samples/test-lua/proj.mac/en.lproj/InfoPlist.strings
similarity index 100%
rename from samples/Cpp/TestCpp/proj.mac/en.lproj/InfoPlist.strings
rename to samples/test-lua/proj.mac/en.lproj/InfoPlist.strings
diff --git a/samples/Cpp/HelloCpp/proj.mac/en.lproj/MainMenu.xib b/samples/test-lua/proj.mac/en.lproj/MainMenu.xib
similarity index 100%
rename from samples/Cpp/HelloCpp/proj.mac/en.lproj/MainMenu.xib
rename to samples/test-lua/proj.mac/en.lproj/MainMenu.xib
diff --git a/samples/Lua/TestLua/proj.mac/main.cpp b/samples/test-lua/proj.mac/main.cpp
similarity index 100%
rename from samples/Lua/TestLua/proj.mac/main.cpp
rename to samples/test-lua/proj.mac/main.cpp
diff --git a/samples/Lua/TestLua/proj.win32/TestLua.rc b/samples/test-lua/proj.win32/TestLua.rc
similarity index 100%
rename from samples/Lua/TestLua/proj.win32/TestLua.rc
rename to samples/test-lua/proj.win32/TestLua.rc
diff --git a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj b/samples/test-lua/proj.win32/TestLua.win32.vcxproj
similarity index 85%
rename from samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
rename to samples/test-lua/proj.win32/TestLua.win32.vcxproj
index 7d04e0f16c..799ae15647 100644
--- a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
+++ b/samples/test-lua/proj.win32/TestLua.win32.vcxproj
@@ -36,13 +36,13 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2d_headers.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2dx.props" />
-    <Import Project="..\..\..\..\cocos\2d\cocos2d_headers.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2dx.props" />
+    <Import Project="..\..\..\cocos\2d\cocos2d_headers.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -104,8 +104,8 @@
       </DllDataFileName>
     </Midl>
     <PreBuildEvent>
-      <Command>xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
-xcopy "$(EngineRoot)cocos\scripting\lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y</Command>
+      <Command>xcopy "$(ProjectDir)..\..\test-cpp\Resources" "$(ProjectDir)..\Resources" /e /Y
+xcopy "$(EngineRoot)cocos\scripting\lua\script" "$(ProjectDir)..\Resources" /e /Y</Command>
       <Message>copy files from TestCpp to TestLua</Message>
     </PreBuildEvent>
     <PreLinkEvent>
@@ -152,13 +152,13 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\\win32\*.*" "$(OutDir)"</
       </DllDataFileName>
     </Midl>
     <PreBuildEvent>
-      <Command>xcopy "$(ProjectDir)..\..\..\Cpp\TestCpp\Resources" "$(ProjectDir)..\..\TestLua\Resources" /e /Y
-xcopy "$(ProjectDir)..\..\..\..\cocos\scripting\lua\script" "$(ProjectDir)..\..\TestLua\Resources" /e /Y</Command>
+      <Command>xcopy "$(ProjectDir)..\..\test-cpp\Resources" "$(ProjectDir)..\Resources" /e /Y
+xcopy "$(EngineRoot)cocos\scripting\lua\script" "$(ProjectDir)..\Resources" /e /Y</Command>
       <Message>copy files from TestCpp to TestLua</Message>
     </PreBuildEvent>
     <PreLinkEvent>
       <Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
-xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
+xcopy /Y /Q "$(ProjectDir)..\..\..\external\websockets\prebuilt\win32\*.*" "$(OutDir)"</Command>
     </PreLinkEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -172,37 +172,37 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
     <ClCompile Include="main.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\cocos\2d\cocos2d.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\2d\cocos2d.vcxproj">
       <Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\audio\proj.win32\CocosDenshion.vcxproj">
       <Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj">
       <Project>{811c0dab-7b96-4bd3-a154-b7572b58e4ab}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj">
       <Project>{b57cf53f-2e49-4031-9822-047cc0e6bde2}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj">
       <Project>{b7c2a162-dec9-4418-972e-240ab3cbfcae}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\gui\proj.win32\libGUI.vcxproj">
       <Project>{7e06e92c-537a-442b-9e4a-4761c84f8a1a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\network\proj.win32\libNetwork.vcxproj">
       <Project>{df2638c0-8128-4847-867c-6eafe3dee7b5}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\scripting\lua\bindings\liblua.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\scripting\lua\bindings\liblua.vcxproj">
       <Project>{ddc3e27f-004d-4dd4-9dd3-931a013d2159}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
+    <ProjectReference Include="..\..\..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj">
       <Project>{632a8f38-d0f0-4d22-86b3-d69f5e6bf63a}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\extensions\proj.win32\libExtensions.vcxproj">
+    <ProjectReference Include="..\..\..\extensions\proj.win32\libExtensions.vcxproj">
       <Project>{21b2c324-891f-48ea-ad1a-5ae13de12e28}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
+    <ProjectReference Include="..\..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
       <Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj.filters b/samples/test-lua/proj.win32/TestLua.win32.vcxproj.filters
similarity index 100%
rename from samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj.filters
rename to samples/test-lua/proj.win32/TestLua.win32.vcxproj.filters
diff --git a/samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj.user b/samples/test-lua/proj.win32/TestLua.win32.vcxproj.user
similarity index 100%
rename from samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj.user
rename to samples/test-lua/proj.win32/TestLua.win32.vcxproj.user
diff --git a/samples/Lua/TestLua/proj.win32/main.cpp b/samples/test-lua/proj.win32/main.cpp
similarity index 100%
rename from samples/Lua/TestLua/proj.win32/main.cpp
rename to samples/test-lua/proj.win32/main.cpp
diff --git a/samples/Lua/TestLua/proj.win32/main.h b/samples/test-lua/proj.win32/main.h
similarity index 100%
rename from samples/Lua/TestLua/proj.win32/main.h
rename to samples/test-lua/proj.win32/main.h
diff --git a/samples/Lua/TestLua/proj.win32/res/TestLua.ico b/samples/test-lua/proj.win32/res/TestLua.ico
similarity index 100%
rename from samples/Lua/TestLua/proj.win32/res/TestLua.ico
rename to samples/test-lua/proj.win32/res/TestLua.ico
diff --git a/samples/Lua/TestLua/proj.win32/resource.h b/samples/test-lua/proj.win32/resource.h
similarity index 100%
rename from samples/Lua/TestLua/proj.win32/resource.h
rename to samples/test-lua/proj.win32/resource.h
diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh
index aa9c47f5c6..c554780fec 100755
--- a/tools/travis-scripts/run-script.sh
+++ b/tools/travis-scripts/run-script.sh
@@ -42,7 +42,7 @@ elif [ "$PLATFORM"x = "android"x ]; then
     # Create a directory for temporary objects
     mkdir android_build_objs
 
-    PROJECTS=("Cpp/HelloCpp" "Cpp/TestCpp" "Cpp/SimpleGame" "Cpp/AssetsManagerTest" "Javascript/TestJavascript" "Javascript/CocosDragonJS" "Javascript/CrystalCraze" "Javascript/MoonWarriors" "Javascript/WatermelonWithMe" "Lua/HelloLua" "Lua/TestLua")
+    PROJECTS=("test-cpp" "test-javascript" "test-lua")
     for i in ${PROJECTS[*]}; do
         ln -s $COCOS2DX_ROOT/android_build_objs $COCOS2DX_ROOT/samples/$i/proj.android/obj
     done