diff --git a/cocos2dx/support/user_default/CCUserDefault.cpp b/cocos2dx/support/user_default/CCUserDefault.cpp
index a38be0ad0f..44e4af6634 100644
--- a/cocos2dx/support/user_default/CCUserDefault.cpp
+++ b/cocos2dx/support/user_default/CCUserDefault.cpp
@@ -66,6 +66,7 @@ static tinyxml2::XMLElement* getXMLNodeForKey(const char* pKey, tinyxml2::XMLEle
 			break;
 		}
 		xmlDoc->Parse(pXmlBuffer);
+        delete[] pXmlBuffer;
 		// get root node
 		*rootNode = xmlDoc->RootElement();
 		if (NULL == *rootNode)
diff --git a/cocos2dx/support/user_default/CCUserDefault.mm b/cocos2dx/support/user_default/CCUserDefault.mm
index 8936a65e07..285c729879 100644
--- a/cocos2dx/support/user_default/CCUserDefault.mm
+++ b/cocos2dx/support/user_default/CCUserDefault.mm
@@ -81,6 +81,7 @@ static tinyxml2::XMLElement* getXMLNodeForKey(const char* pKey, tinyxml2::XMLDoc
 			break;
 		}
 		xmlDoc->Parse(pXmlBuffer);
+        delete[] pXmlBuffer;
 		// get root node
 		rootNode = xmlDoc->RootElement();
 		if (NULL == rootNode)
diff --git a/cocos2dx/support/user_default/CCUserDefaultAndroid.cpp b/cocos2dx/support/user_default/CCUserDefaultAndroid.cpp
index b94d474609..220adf0deb 100644
--- a/cocos2dx/support/user_default/CCUserDefaultAndroid.cpp
+++ b/cocos2dx/support/user_default/CCUserDefaultAndroid.cpp
@@ -82,6 +82,7 @@ static tinyxml2::XMLElement* getXMLNodeForKey(const char* pKey, tinyxml2::XMLDoc
             break;
         }
         xmlDoc->Parse(pXmlBuffer);
+		delete[] pXmlBuffer;
         // get root node
         rootNode = xmlDoc->RootElement();
         if (NULL == rootNode)
diff --git a/extensions/CCBReader/CCBReader.cpp b/extensions/CCBReader/CCBReader.cpp
index 6ef45fbb58..73e8f87ad2 100644
--- a/extensions/CCBReader/CCBReader.cpp
+++ b/extensions/CCBReader/CCBReader.cpp
@@ -1040,9 +1040,16 @@ CCArray* CCBReader::getAnimationManagersForNodes() {
  Static functions
  ************************************************************************/
 
+static float __ccbResolutionScale = 1.0f;
+
 float CCBReader::getResolutionScale()
 {
-    return 1;
+    return __ccbResolutionScale;
+}
+
+void CCBReader::setResolutionScale(float scale)
+{
+    __ccbResolutionScale = scale;
 }
 
 NS_CC_EXT_END;
diff --git a/extensions/CCBReader/CCBReader.h b/extensions/CCBReader/CCBReader.h
index 9de48663d3..a20ce1268c 100644
--- a/extensions/CCBReader/CCBReader.h
+++ b/extensions/CCBReader/CCBReader.h
@@ -270,6 +270,7 @@ public:
     void addDocumentCallbackNode(CCNode *node);
     
     static float getResolutionScale();
+    static void setResolutionScale(float scale);
     
     CCNode* readFileWithCleanUp(bool bCleanUp, CCDictionary* am);
 
diff --git a/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp b/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp
index d2731fd336..b24efba989 100644
--- a/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp
+++ b/samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp
@@ -3,8 +3,6 @@
 #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__)
 
diff --git a/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id b/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
index 4da2ef9ce2..73e2087859 100644
--- a/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
+++ b/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
@@ -1 +1 @@
-643c72abe675dc711e46f2dd6b14187713cfb8d3
\ No newline at end of file
+3ff60497346cab1d4592901c3a03048c34bf725a
\ No newline at end of file
diff --git a/scripting/javascript/bindings/generated b/scripting/javascript/bindings/generated
index bffc3adca9..6e3124f76c 160000
--- a/scripting/javascript/bindings/generated
+++ b/scripting/javascript/bindings/generated
@@ -1 +1 @@
-Subproject commit bffc3adca972b977b6d22888e23b58cbe3d17d97
+Subproject commit 6e3124f76cde92091615793137dbd2a1c451dac5