Merge branch 'master' into px-m

# Conflicts:
#	examples/pxScene2d/src/v8_modules/native_http_wrap.js
#	examples/pxScene2d/src/v8_modules/path.js

Author: jiangliwu

examples/pxScene2d/src/node_modules/htmlparser/index.js

@@ -124,7 +124,7 @@ NativeHttp.prototype.on = function(eventName, handler) {
         this.emit.$on('response', handler);
         return;
     }
-
+    
     this._httpInstance.on(eventName, handler);
     return this;
 };