Fix Conflicts:

.gitignore
	index.html
	js/controllers/backup.js
	js/controllers/sidebar.js

js/services/backupService.js

@@ -28,6 +28,18 @@ BackupService.prototype.download = function(wallet) {
       wallet: ew
     });
   }
+
+  // throw an email intent if we are in the mobile version
+  if (window.cordova) {
+    var name = wallet.name ? wallet.name + ' ' : '';
+    var partial = partial ? 'Partial ' : '';
+    return window.plugin.email.open({
+      subject: 'Copay - ' + name + 'Wallet ' + partial + 'Backup',
+      body: 'Here is the encrypted backup of the wallet ' + wallet.id,
+      attachments: ['base64:' + filename + '//' + btoa(ew)]
+    });
+  }
+
   // otherwise lean on the browser implementation
   saveAs(blob, filename);
 };

js/services/controllerUtils.js

@@ -149,15 +149,17 @@ angular.module('copayApp.services')
         }, 3000);
       });
       w.on('txProposalEvent', function(e) {
+        var user = w.publicKeyRing.nicknameForCopayer(e.cId);
         switch (e.type) {
           case 'signed':
-            var user = w.publicKeyRing.nicknameForCopayer(e.cId);
             notification.info('Transaction Update', 'A transaction was signed by ' + user);
             break;
           case 'rejected':
-            var user = w.publicKeyRing.nicknameForCopayer(e.cId);
             notification.info('Transaction Update', 'A transaction was rejected by ' + user);
             break;
+          case 'corrupt':
+            notification.error('Transaction Error', 'Received corrupt transaction from '+user);
+            break;
         }
       });
       w.on('addressBookUpdated', function(dontDigest) {

js/services/notifications.js

@@ -198,7 +198,12 @@ factory('notification', ['$timeout',
           $timeout(function removeFromQueueTimeout() {
             queue.splice(queue.indexOf(notification), 1);
           }, settings[type].duration);
+        }
 
+        // Movile notification
+        window.navigator.vibrate([200,100,200]);
+        if (document.hidden && (type == 'info' || type == 'funds')) {
+          new window.Notification(title, {body: content, icon:'img/notification.png'});
         }
 
         this.save();