diff --git a/extensions/network/HttpClient.cpp b/extensions/network/HttpClient.cpp
index 025f058e99..252102fcab 100644
--- a/extensions/network/HttpClient.cpp
+++ b/extensions/network/HttpClient.cpp
@@ -86,10 +86,10 @@ static size_t writeHeaderData(void *ptr, size_t size, size_t nmemb, void *stream
 }
 
 
-static int processGetTask(HttpRequest *request, write_callback callback, void *stream, int32_t *errorCode, write_callback headerCallback, void *headerStream);
-static int processPostTask(HttpRequest *request, write_callback callback, void *stream, int32_t *errorCode, write_callback headerCallback, void *headerStream);
-static int processPutTask(HttpRequest *request, write_callback callback, void *stream, int32_t *errorCode, write_callback headerCallback, void *headerStream);
-static int processDeleteTask(HttpRequest *request, write_callback callback, void *stream, int32_t *errorCode, write_callback headerCallback, void *headerStream);
+static int processGetTask(HttpRequest *request, write_callback callback, void *stream, long *errorCode, write_callback headerCallback, void *headerStream);
+static int processPostTask(HttpRequest *request, write_callback callback, void *stream, long *errorCode, write_callback headerCallback, void *headerStream);
+static int processPutTask(HttpRequest *request, write_callback callback, void *stream, long *errorCode, write_callback headerCallback, void *headerStream);
+static int processDeleteTask(HttpRequest *request, write_callback callback, void *stream, long *errorCode, write_callback headerCallback, void *headerStream);
 // int processDownloadTask(HttpRequest *task, write_callback callback, void *stream, int32_t *errorCode);
 
 
@@ -137,7 +137,7 @@ static void networkThread(void)
         request->release();
         // ok, refcount = 1 now, only HttpResponse hold it.
         
-        int32_t responseCode = -1;
+        long responseCode = -1;
         int retValue = 0;
 
         // Process the request -> get response packet
@@ -320,7 +320,7 @@ public:
     }
 
     /// @param responseCode Null not allowed
-    bool perform(int *responseCode)
+    bool perform(long *responseCode)
     {
         if (CURLE_OK != curl_easy_perform(_curl))
             return false;
@@ -336,7 +336,7 @@ public:
 };
 
 //Process Get Request
-static int processGetTask(HttpRequest *request, write_callback callback, void *stream, int32_t *responseCode, write_callback headerCallback, void *headerStream)
+static int processGetTask(HttpRequest *request, write_callback callback, void *stream, long *responseCode, write_callback headerCallback, void *headerStream)
 {
     CURLRaii curl;
     bool ok = curl.init(request, callback, stream, headerCallback, headerStream)
@@ -346,7 +346,7 @@ static int processGetTask(HttpRequest *request, write_callback callback, void *s
 }
 
 //Process POST Request
-static int processPostTask(HttpRequest *request, write_callback callback, void *stream, int32_t *responseCode, write_callback headerCallback, void *headerStream)
+static int processPostTask(HttpRequest *request, write_callback callback, void *stream, long *responseCode, write_callback headerCallback, void *headerStream)
 {
     CURLRaii curl;
     bool ok = curl.init(request, callback, stream, headerCallback, headerStream)
@@ -358,7 +358,7 @@ static int processPostTask(HttpRequest *request, write_callback callback, void *
 }
 
 //Process PUT Request
-static int processPutTask(HttpRequest *request, write_callback callback, void *stream, int32_t *responseCode, write_callback headerCallback, void *headerStream)
+static int processPutTask(HttpRequest *request, write_callback callback, void *stream, long *responseCode, write_callback headerCallback, void *headerStream)
 {
     CURLRaii curl;
     bool ok = curl.init(request, callback, stream, headerCallback, headerStream)
@@ -370,7 +370,7 @@ static int processPutTask(HttpRequest *request, write_callback callback, void *s
 }
 
 //Process DELETE Request
-static int processDeleteTask(HttpRequest *request, write_callback callback, void *stream, int32_t *responseCode, write_callback headerCallback, void *headerStream)
+static int processDeleteTask(HttpRequest *request, write_callback callback, void *stream, long *responseCode, write_callback headerCallback, void *headerStream)
 {
     CURLRaii curl;
     bool ok = curl.init(request, callback, stream, headerCallback, headerStream)
diff --git a/install-deps-linux.sh b/install-deps-linux.sh
index d122e6a451..f62c78a3e8 100755
--- a/install-deps-linux.sh
+++ b/install-deps-linux.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Change directory to the location of this script
+cd $(dirname ${BASH_SOURCE[0]})
+
 DEPENDS='libx11-dev'
 DEPENDS+=' libxmu-dev'
 DEPENDS+=' libglu1-mesa-dev'
@@ -28,3 +31,6 @@ if [ -n "$MISSING" ]; then
     sudo apt-get --force-yes --yes install $MISSING
 fi
 
+# install glfw
+tools/travis-scripts/install_glfw.sh
+
diff --git a/make-all-linux-project.sh b/make-all-linux-project.sh
index b0d3ef0881..4889355380 100755
--- a/make-all-linux-project.sh
+++ b/make-all-linux-project.sh
@@ -15,7 +15,6 @@ cd $(dirname ${BASH_SOURCE[0]})
 
 if $COCOS2DX_USEAPT; then
     ./install-deps-linux.sh
-    tools/travis-scripts/install_glfw.sh
 fi
 
 export MAKEFLAGS=-j10
diff --git a/samples/Javascript/Shared b/samples/Javascript/Shared
index 9f73f0db3b..022292761c 160000
--- a/samples/Javascript/Shared
+++ b/samples/Javascript/Shared
@@ -1 +1 @@
-Subproject commit 9f73f0db3b2a95a8c9fe087e7770dc469c27c94a
+Subproject commit 022292761c6a9d056e25cc6e844430650208513f
diff --git a/scripting/auto-generated b/scripting/auto-generated
index 558b0d0b08..bff05d857c 160000
--- a/scripting/auto-generated
+++ b/scripting/auto-generated
@@ -1 +1 @@
-Subproject commit 558b0d0b086fc2b5011b49237fa5f49b6d6537f4
+Subproject commit bff05d857c2e3b4a412e97b903ddb97d95232c1e
diff --git a/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id b/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
index f028b5a79f..2d22e63272 100644
--- a/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
+++ b/scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
@@ -1 +1 @@
-cd24df86bd74572c1ef45ee4af05633066a9d966
\ No newline at end of file
+32258227169afc6f38d187ff2ecc4175a852efef
\ No newline at end of file
diff --git a/scripting/javascript/bindings/js/jsb_deprecated.js b/scripting/javascript/bindings/js/jsb_deprecated.js
index 2257f0fb5f..89efd00284 100644
--- a/scripting/javascript/bindings/js/jsb_deprecated.js
+++ b/scripting/javascript/bindings/js/jsb_deprecated.js
@@ -60,4 +60,8 @@ var cc = cc || {};
         return cc.TMXTiledMap.prototype.getPropertiesForGID.apply(this, arguments);
     };
 
+    cc.Menu.prototype.setHandlerPriority = function() {
+        cc.log("cc.Menu.setHandlerPriority was deprecated, 3.0 uses new event dispatcher to dispatch touch event based on draw order, so setHandlerPriority is not needed now.");
+    };
+
 })();
diff --git a/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj
index 8f34754a1c..26b32e1539 100644
--- a/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj
+++ b/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj
@@ -613,7 +613,7 @@
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
-				VALID_ARCHS = "armv6 armv7 i386";
+				VALID_ARCHS = "armv6 armv7 armv7s i386";
 			};
 			name = Debug;
 		};
@@ -664,6 +664,7 @@
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "";
 				VALIDATE_PRODUCT = YES;
+				VALID_ARCHS = "armv6 armv7 armv7s i386";
 			};
 			name = Release;
 		};