Fix Conflicts:

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

test/unit/directives/directivesSpec.js

@@ -180,25 +180,25 @@ describe("Unit: Testing Directives", function() {
     it('should check very weak password', function() {
       $scope.password = 'asd';
       $scope.$digest();
-      expect($scope.passwordStrength).to.equal('very weak');
+      expect($scope.passwordStrength).to.equal('Very Weak, that\'s short');
     });
 
     it('should check weak password', function() {
       $scope.password = 'asdasdASDASD';
       $scope.$digest();
-      expect($scope.passwordStrength).to.equal('weak');
+      expect($scope.passwordStrength).to.equal('Weak, add numerals');
     });
 
     it('should check medium password', function() {
-      $scope.password = 'asdasdASDASD1';
+      $scope.password = 'asdasdA1';
       $scope.$digest();
-      expect($scope.passwordStrength).to.equal('medium');
+      expect($scope.passwordStrength).to.equal('Medium, add punctuation');
     });
 
     it('should check strong password', function() {
       $scope.password = 'asdasdASDASD1{';
       $scope.$digest();
-      expect($scope.passwordStrength).to.equal('strong');
+      expect($scope.passwordStrength).to.equal('Strong, add punctuation');
     });
 
   });

test/unit/filters/filtersSpec.js

@@ -80,26 +80,26 @@ describe('Unit: Testing Filters', function() {
       expect(removeEmpty(undefined).length).to.equal(0);
     }));
 
-    it('should filter empty addresses from other copayers', inject(function($filter) {
+    it('should filter empty change addresses from other copayers', inject(function($filter) {
       var removeEmpty = $filter('removeEmpty');
       var addresses = [{
         owned: true,
+        isChange: false,
         balance: 0
       }, {
         owned: false,
+        isChange: false,
         balance: 0
       }, {
         owned: true,
+        isChange: true,
         balance: 0
       }, {
         owned: false,
+        isChange: true,
         balance: 0
       }];
       expect(removeEmpty(addresses).length).to.equal(2);
-      addresses[1].owned = true;
-      expect(removeEmpty(addresses).length).to.equal(3);
-      addresses[3].balance = 10;
-      expect(removeEmpty(addresses).length).to.equal(4);
     }));
   });