Merge remote-tracking branch 'origin/wallet/sprint/17' into wallet/sprint/17

# Conflicts:
#	src/js/controllers/tab-scan.js

src/js/controllers/tab-scan.js

@@ -108,6 +108,9 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
   function handleSuccessfulScan(contents){
     $log.debug('Scan returned: "' + contents + '"');
     scannerService.pausePreview();
+    // Sometimes (testing in Chrome, when reading QR Code) data is an object
+    // that has a string data.result.
+    contents = contents.result || contents;
     incomingData.redir(contents);
   }