Merge branch '1.3' of github.com:RocketChat/Rocket.Chat into 1.3

packages/autoupdate/autoupdate_cordova.js

@@ -320,3 +320,8 @@ Meteor.startup(Autoupdate._retrySubscription);
 //   }
 // };
 
+window.WebAppLocalServer = {};
+WebAppLocalServer.startupDidComplete = function() {};
+WebAppLocalServer.checkForUpdates = function() {};
+WebAppLocalServer.onNewVersionReady = function() {};
+WebAppLocalServer.onError = function() {};

packages/rocketchat-cors/cors.coffee

@@ -28,7 +28,7 @@ WebApp.rawConnectHandlers.use (req, res, next) ->
 
 
 WebApp.rawConnectHandlers.use (req, res, next) ->
-	if /^\/(api|_timesync|sockjs|tap-i18n)(\/|$)/.test req.url
+	if /^\/(api|_timesync|sockjs|tap-i18n|__cordova)(\/|$)/.test req.url
 		res.setHeader("Access-Control-Allow-Origin", "*")
 
 	# Block next handlers to override CORS with value http://meteor.local