Minor fixes and guide pages update.

MasterPassword/ObjC/iOS/MPAvatarCell.m

@@ -273,7 +273,7 @@ const long MPAvatarAdd = 10000;
         self.avatarImageView.layer.cornerRadius = self.avatarImageView.bounds.size.height / 2;
         self.spinner.alpha = self.spinnerActive? 1: 0;
 
-        [self layoutIfNeeded];
+        [self layoutSubviews];
     }                completion:nil];
 }
 

MasterPassword/ObjC/iOS/MPGuideViewController.m

@@ -50,16 +50,14 @@
             [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-5"] caption:
                     @"Your sites are easy to find and sorted by recency.\nTap any site to copy its password.\nYou can now switch and paste it in another app."],
             [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-6"] caption:
-                    @"If the site you're looking for isn't easy to find, just type a few letters in the search box to filter the site list."],
-            [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-7"] caption:
-                    @"If you ever need a new password for the site, just tap the plus icon to increment its counter.\nYou can hold down to reset it back to 1."],
-            [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-8"] caption:
                     @"The user icon lets you save your site's login.\nThis is useful if you find it hard to remember the user name for this site."],
+            [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-7"] caption:
+                    @"To make changes to the site password, tap the settings icon or swipe left to reveal extra buttons."],
+            [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-8"] caption:
+                    @"If you ever need a new password for the site, just tap the plus icon to increment its counter.\nYou can hold down to reset it back to 1."],
             [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-9"] caption:
-                    @"Master Password lets you swipe to upgrade or downgrade your password's complexity.\nSome sites won't let you use complex passwords."],
+                    @"Use the list icon to upgrade or downgrade your password's complexity.\nSome sites won't let you use complex passwords."],
             [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-10"] caption:
-                    @"To delete a site, swipe it all the way left to find the \"Delete Site\" button."],
-            [MPGuideStep stepWithImage:[UIImage imageNamed:@"image-11"] caption:
                     @"If you have a password that you cannot change, you can save it as a Personal password.  Device Private means the site will not be backed up."],
     ];
 }

MasterPassword/ObjC/iOS/MPiOSAppDelegate.m

@@ -565,6 +565,7 @@
 - (void)ubiquityStoreManager:(UbiquityStoreManager *)manager willLoadStoreIsCloud:(BOOL)isCloudStore {
 
     dispatch_async( dispatch_get_main_queue(), ^{
+        [self signOutAnimated:YES];
         [self.handleCloudContentAlert cancelAlertAnimated:YES];
         if (!self.storeLoadingOverlay)
             self.storeLoadingOverlay = [PearlOverlay showProgressOverlayWithTitle:@"Loading Sites"];

MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj

@@ -53,8 +53,6 @@
 		DA071BF3190187FE00179766 /* empty@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF1190187FE00179766 /* empty@2x.png */; };
 		DA071BF4190187FE00179766 /* empty.png in Resources */ = {isa = PBXBuildFile; fileRef = DA071BF2190187FE00179766 /* empty.png */; };
 		DA095E75172F4CD8001C948B /* MPLogsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D3979190DACEBD1F6AE9F4 /* MPLogsViewController.m */; };
-		DA2509FB1956484D00AC23F1 /* image-11@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E11956484D00AC23F1 /* image-11@2x.png */; };
-		DA2509FC1956484D00AC23F1 /* image-11.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E21956484D00AC23F1 /* image-11.png */; };
 		DA2509FD1956484D00AC23F1 /* image-10@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E31956484D00AC23F1 /* image-10@2x.png */; };
 		DA2509FE1956484D00AC23F1 /* image-10.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E41956484D00AC23F1 /* image-10.png */; };
 		DA2509FF1956484D00AC23F1 /* image-9@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DA2509E51956484D00AC23F1 /* image-9@2x.png */; };
@@ -443,8 +441,6 @@
 		DA04E33D14B1E70400ECA4F3 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		DA071BF1190187FE00179766 /* empty@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "empty@2x.png"; sourceTree = "<group>"; };
 		DA071BF2190187FE00179766 /* empty.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = empty.png; sourceTree = "<group>"; };
-		DA2509E11956484D00AC23F1 /* image-11@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-11@2x.png"; sourceTree = "<group>"; };
-		DA2509E21956484D00AC23F1 /* image-11.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-11.png"; sourceTree = "<group>"; };
 		DA2509E31956484D00AC23F1 /* image-10@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-10@2x.png"; sourceTree = "<group>"; };
 		DA2509E41956484D00AC23F1 /* image-10.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-10.png"; sourceTree = "<group>"; };
 		DA2509E51956484D00AC23F1 /* image-9@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "image-9@2x.png"; sourceTree = "<group>"; };
@@ -1417,8 +1413,6 @@
 		DA2509B619563E1E00AC23F1 /* Guide */ = {
 			isa = PBXGroup;
 			children = (
-				DA2509E11956484D00AC23F1 /* image-11@2x.png */,
-				DA2509E21956484D00AC23F1 /* image-11.png */,
 				DA2509E31956484D00AC23F1 /* image-10@2x.png */,
 				DA2509E41956484D00AC23F1 /* image-10.png */,
 				DA2509E51956484D00AC23F1 /* image-9@2x.png */,
@@ -3019,7 +3013,6 @@
 				DABD393E1711E29700CF925C /* avatar-12.png in Resources */,
 				DABD393F1711E29700CF925C /* avatar-12@2x.png in Resources */,
 				DA67461018DE7F0C00DFE240 /* Exo2.0-Bold.otf in Resources */,
-				DA2509FC1956484D00AC23F1 /* image-11.png in Resources */,
 				DABD39401711E29700CF925C /* avatar-13.png in Resources */,
 				DABD39411711E29700CF925C /* avatar-13@2x.png in Resources */,
 				DABD39421711E29700CF925C /* avatar-14.png in Resources */,
@@ -3122,7 +3115,6 @@
 				DABD3C251711E2DC00CF925C /* Settings.bundle in Resources */,
 				DABD3C261711E2DC00CF925C /* InfoPlist.strings in Resources */,
 				DA25C5F8197AFFB40046CDCF /* icon_tools.png in Resources */,
-				DA2509FB1956484D00AC23F1 /* image-11@2x.png in Resources */,
 				DA250A0B1956484D00AC23F1 /* image-3@2x.png in Resources */,
 				DABD3FCA1712446200CF925C /* cloud.png in Resources */,
 				DABD3FCB1712446200CF925C /* cloud@2x.png in Resources */,

MasterPassword/ObjC/iOS/Storyboard.storyboard

@@ -2435,7 +2435,7 @@ See </string>
         <image name="icon_trash.png" width="32" height="32"/>
         <image name="icon_up.png" width="32" height="32"/>
         <image name="identity.png" width="82" height="80"/>
-        <image name="image-0.png" width="256" height="384"/>
+        <image name="image-0.png" width="320" height="568"/>
         <image name="tip_basic_black.png" width="210" height="60"/>
         <image name="ui_spinner.png" width="75" height="75"/>
         <image name="ui_textfield.png" width="158" height="34"/>