diff --git a/HelloWorld/Resource/app.icf b/HelloWorld/Resource/app.icf
index db207a6c09..5cbbb8a49f 100644
--- a/HelloWorld/Resource/app.icf
+++ b/HelloWorld/Resource/app.icf
@@ -1,7 +1,7 @@
 [S3E]
 
 MemSize=[s3e]SCREENSIZE + 50331648
-MemFlags0=USE_STACK_ALLOCATOR
+#MemFlags0=USE_STACK_ALLOCATOR
 FixScreenOrientation = 1
 
 
diff --git a/cocos2dx/touch_dispatcher/CCTouchDispatcher.cpp b/cocos2dx/touch_dispatcher/CCTouchDispatcher.cpp
index 5586a90da8..9b48f529b6 100644
--- a/cocos2dx/touch_dispatcher/CCTouchDispatcher.cpp
+++ b/cocos2dx/touch_dispatcher/CCTouchDispatcher.cpp
@@ -264,7 +264,7 @@ CCTouchHandler* CCTouchDispatcher::findHandler(CCTouchDelegate *pDelegate)
 
 void CCTouchDispatcher::rearrangeHandlers(CCMutableArray<CCTouchHandler*> *pArray)
 {
-	sort(pArray->begin(), pArray->end(), less);
+	std::sort(pArray->begin(), pArray->end(), less);
 }
 
 void CCTouchDispatcher::setPriority(int nPriority, CCTouchDelegate *pDelegate)
diff --git a/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
index 0bf1928fdf..ac2c3c3ff9 100644
--- a/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-58728dc0be18955fcaabb9d6cd2ead3fdf389132
\ No newline at end of file
+ef940d5753a60f54cba21c8c503248f75bd3ab98
\ No newline at end of file
diff --git a/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
index ce4b99de99..8cc41a1857 100644
--- a/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-f04508231e03751a17872c963c91f97e4335132a
\ No newline at end of file
+55a23e272c4ae52bb22a27f5bd0f4309bcb4c683
\ No newline at end of file
diff --git a/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
index 754a4eabba..3d600f7633 100644
--- a/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-62513e048519ce58a6a7b19d444f751b0e6ae9a4
\ No newline at end of file
+e927644074613ed3644c897bdb0912660335380e
\ No newline at end of file
diff --git a/template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id b/template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
index de5d0bb0c7..dfdf378814 100644
--- a/template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-c8cbd6aa2f9f570eda299b591f7b2903a4c954c7
\ No newline at end of file
+dec21d9705b1a93bf01aac9fb46e3e65996adfba
\ No newline at end of file
diff --git a/tests/Res/app.icf b/tests/Res/app.icf
index 74ed0ce9aa..589c89a583 100644
--- a/tests/Res/app.icf
+++ b/tests/Res/app.icf
@@ -1,7 +1,7 @@
 [S3E]
 
 MemSize=[s3e]SCREENSIZE + 50331648
-MemFlags0=USE_STACK_ALLOCATOR
+#MemFlags0=USE_STACK_ALLOCATOR
 FixScreenOrientation = 1
 
 
diff --git a/tests/test.android/jni/tests/Android.mk b/tests/test.android/jni/tests/Android.mk
index c9731e5ff6..9b78e87d1a 100644
--- a/tests/test.android/jni/tests/Android.mk
+++ b/tests/test.android/jni/tests/Android.mk
@@ -11,6 +11,17 @@ LOCAL_SRC_FILES := main.cpp \
 ../../../tests/Box2DTestBed/GLES-Render.cpp \
 ../../../tests/Box2DTestBed/Test.cpp \
 ../../../tests/Box2DTestBed/TestEntries.cpp \
+../../../tests/BugsTest/Bug-1159.cpp \
+../../../tests/BugsTest/Bug-1174.cpp \
+../../../tests/BugsTest/Bug-350.cpp \
+../../../tests/BugsTest/Bug-422.cpp \
+../../../tests/BugsTest/Bug-624.cpp \
+../../../tests/BugsTest/Bug-886.cpp \
+../../../tests/BugsTest/Bug-899.cpp \
+../../../tests/BugsTest/Bug-914.cpp \
+../../../tests/BugsTest/BugsTest.cpp \
+../../../tests/BugsTest/Bug-458/Bug-458.cpp \
+../../../tests/BugsTest/Bug-458/QuestionContainerSprite.cpp \
 ../../../tests/ChipmunkTest/Bounce.cpp \
 ../../../tests/ChipmunkTest/Joints.cpp \
 ../../../tests/ChipmunkTest/LogoSmash.cpp \
@@ -36,6 +47,7 @@ LOCAL_SRC_FILES := main.cpp \
 ../../../tests/CocosDenshionTest/CocosDenshionTest.cpp \
 ../../../tests/CocosNodeTest/CocosNodeTest.cpp \
 ../../../tests/CurlTest/CurlTest.cpp \
+../../../tests/DirectorTest/DirectorTest.cpp \
 ../../../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp \
 ../../../tests/EaseActionsTest/EaseActionsTest.cpp \
 ../../../tests/EffectsAdvancedTest/EffectsAdvancedTest.cpp \
diff --git a/tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id b/tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
index f5ad76e4aa..9f541a67a4 100644
--- a/tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/tests/test.ios/test.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-2a6419e2f46f039761c135c554fd04f4a9551313
\ No newline at end of file
+33ad1fd0694c56b7b34f9ebd3e563782e572c270
\ No newline at end of file
diff --git a/tests/test.wophone/Makefile.ARM b/tests/test.wophone/Makefile.ARM
index fe05a5e51f..b58a2514dd 100644
--- a/tests/test.wophone/Makefile.ARM
+++ b/tests/test.wophone/Makefile.ARM
@@ -50,6 +50,17 @@ OBJECTS = \
 	$(OBJECTS_DIR)/GLES-Render.o \
 	$(OBJECTS_DIR)/Test.o \
 	$(OBJECTS_DIR)/TestEntries.o \
+	$(OBJECTS_DIR)/Bug-1159.o \
+	$(OBJECTS_DIR)/Bug-1174.o \
+	$(OBJECTS_DIR)/Bug-350.o \
+	$(OBJECTS_DIR)/Bug-422.o \
+	$(OBJECTS_DIR)/Bug-624.o \
+	$(OBJECTS_DIR)/Bug-886.o \
+	$(OBJECTS_DIR)/Bug-899.o \
+	$(OBJECTS_DIR)/Bug-914.o \
+	$(OBJECTS_DIR)/BugsTest.o \
+	$(OBJECTS_DIR)/Bug-458.o \
+	$(OBJECTS_DIR)/QuestionContainerSprite.o \
 	$(OBJECTS_DIR)/Bounce.o \
 	$(OBJECTS_DIR)/cocos2dChipmunkDemo.o \
 	$(OBJECTS_DIR)/drawSpace.o \
@@ -75,6 +86,7 @@ OBJECTS = \
 	$(OBJECTS_DIR)/CocosDenshionTest.o \
 	$(OBJECTS_DIR)/CocosNodeTest.o \
 	$(OBJECTS_DIR)/CurlTest.o \
+	$(OBJECTS_DIR)/DirectorTest.o \
 	$(OBJECTS_DIR)/DrawPrimitivesTest.o \
 	$(OBJECTS_DIR)/EaseActionsTest.o \
 	$(OBJECTS_DIR)/EffectsAdvancedTest.o \
@@ -168,6 +180,39 @@ $(OBJECTS_DIR)/Test.o : ../tests/Box2DTestBed/Test.cpp
 $(OBJECTS_DIR)/TestEntries.o : ../tests/Box2DTestBed/TestEntries.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TestEntries.o ../tests/Box2DTestBed/TestEntries.cpp
 
+$(OBJECTS_DIR)/Bug-1159.o : ../tests/BugsTest/Bug-1159.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-1159.o ../tests/BugsTest/Bug-1159.cpp
+
+$(OBJECTS_DIR)/Bug-1174.o : ../tests/BugsTest/Bug-1174.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-1174.o ../tests/BugsTest/Bug-1174.cpp
+
+$(OBJECTS_DIR)/Bug-350.o : ../tests/BugsTest/Bug-350.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-350.o ../tests/BugsTest/Bug-350.cpp
+
+$(OBJECTS_DIR)/Bug-422.o : ../tests/BugsTest/Bug-422.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-422.o ../tests/BugsTest/Bug-422.cpp
+
+$(OBJECTS_DIR)/Bug-624.o : ../tests/BugsTest/Bug-624.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-624.o ../tests/BugsTest/Bug-624.cpp
+
+$(OBJECTS_DIR)/Bug-886.o : ../tests/BugsTest/Bug-886.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-886.o ../tests/BugsTest/Bug-886.cpp
+
+$(OBJECTS_DIR)/Bug-899.o : ../tests/BugsTest/Bug-899.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-899.o ../tests/BugsTest/Bug-899.cpp
+
+$(OBJECTS_DIR)/Bug-914.o : ../tests/BugsTest/Bug-914.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-914.o ../tests/BugsTest/Bug-914.cpp
+
+$(OBJECTS_DIR)/BugsTest.o : ../tests/BugsTest/BugsTest.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/BugsTest.o ../tests/BugsTest/BugsTest.cpp
+
+$(OBJECTS_DIR)/Bug-458.o : ../tests/BugsTest/Bug-458/Bug-458.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bug-458.o ../tests/BugsTest/Bug-458/Bug-458.cpp
+
+$(OBJECTS_DIR)/QuestionContainerSprite.o : ../tests/BugsTest/Bug-458/QuestionContainerSprite.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/QuestionContainerSprite.o ../tests/BugsTest/Bug-458/QuestionContainerSprite.cpp
+
 $(OBJECTS_DIR)/Bounce.o : ../tests/ChipmunkTest/Bounce.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Bounce.o ../tests/ChipmunkTest/Bounce.cpp
 
@@ -243,6 +288,9 @@ $(OBJECTS_DIR)/CocosNodeTest.o : ../tests/CocosNodeTest/CocosNodeTest.cpp
 $(OBJECTS_DIR)/CurlTest.o : ../tests/CurlTest/CurlTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CurlTest.o ../tests/CurlTest/CurlTest.cpp
 
+$(OBJECTS_DIR)/DirectorTest.o : ../tests/DirectorTest/DirectorTest.cpp
+	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/DirectorTest.o ../tests/DirectorTest/DirectorTest.cpp
+
 $(OBJECTS_DIR)/DrawPrimitivesTest.o : ../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp
 	$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/DrawPrimitivesTest.o ../tests/DrawPrimitivesTest/DrawPrimitivesTest.cpp
 
diff --git a/tests/test.wophone/test.wophone.vcproj b/tests/test.wophone/test.wophone.vcproj
index 3ac251b90a..231ece1337 100644
--- a/tests/test.wophone/test.wophone.vcproj
+++ b/tests/test.wophone/test.wophone.vcproj
@@ -970,6 +970,114 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="BugsTest"
+					>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-1159.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-1159.h"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-1174.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-1174.h"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-350.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-350.h"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-422.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-422.h"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-624.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-624.h"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-886.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-886.h"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-899.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-899.h"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-914.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\Bug-914.h"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\BugsTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\BugsTest\BugsTest.h"
+						>
+					</File>
+					<Filter
+						Name="Bug-458"
+						>
+						<File
+							RelativePath="..\tests\BugsTest\Bug-458\Bug-458.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\tests\BugsTest\Bug-458\Bug-458.h"
+							>
+						</File>
+						<File
+							RelativePath="..\tests\BugsTest\Bug-458\QuestionContainerSprite.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\tests\BugsTest\Bug-458\QuestionContainerSprite.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="DirectorTest"
+					>
+					<File
+						RelativePath="..\tests\DirectorTest\DirectorTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\tests\DirectorTest\DirectorTest.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 		</Filter>
 		<Filter