Rewrite Mac UI for better multiple site handling.

External/Crashlytics.framework/Versions/A/Resources/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Crashlytics</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.crashlytics.ios</string>
+	<string>com.crashlytics.sdk.mac</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -15,16 +15,16 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.5</string>
+	<string>2.1.2</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
-		<string>iPhoneOS</string>
+		<string>macosx</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>16</string>
+	<string>9</string>
 	<key>DTPlatformName</key>
-	<string>iphoneos</string>
+	<string>macosx</string>
 	<key>MinimumOSVersion</key>
-	<string>4.0</string>
+	<string>10.6</string>
 </dict>
 </plist>

External/Pearl

@@ -1 +1 @@
-Subproject commit dbf08783a3bfe61d27f73ef35cf6dd2fd5dc0567
+Subproject commit 4a3c68dda957adba490aae9b56df018e935d6c84

MasterPassword/ObjC/Mac/MPElementCollectionView.h

@@ -0,0 +1,25 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPElementCollectionView.h
+//  MPElementCollectionView
+//
+//  Created by lhunath on 2/11/2014.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface MPElementCollectionView : NSCollectionViewItem
+
+@property(nonatomic, weak) IBOutlet NSTextField *siteField;
+@property(nonatomic, weak) IBOutlet NSTextField *contentField;
+@end

MasterPassword/ObjC/Mac/MPElementCollectionView.m

@@ -0,0 +1,23 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPElementCollectionView.h
+//  MPElementCollectionView
+//
+//  Created by lhunath on 2/11/2014.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import "MPElementCollectionView.h"
+
+@implementation MPElementCollectionView {
+}
+@end

MasterPassword/ObjC/Mac/MPElementModel.h

@@ -0,0 +1,34 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPElementModel.h
+//  MPElementModel
+//
+//  Created by lhunath on 2/11/2014.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+@class MPElementEntity;
+
+@interface MPElementModel : NSObject
+@property (nonatomic) NSString *site;
+@property (nonatomic) NSString *type;
+@property (nonatomic) NSString *content;
+@property (nonatomic) NSString *loginName;
+@property (nonatomic) NSNumber *uses;
+@property (nonatomic) NSDate *lastUsed;
+
+- (MPElementEntity *)entityForMainThread;
+- (MPElementEntity *)entityInContext:(NSManagedObjectContext *)moc;
+
+- (id)initWithEntity:(MPElementEntity *)entity;
+@end

MasterPassword/ObjC/Mac/MPElementModel.m

@@ -0,0 +1,68 @@
+/**
+ * Copyright Maarten Billemont (http://www.lhunath.com, lhunath@lyndir.com)
+ *
+ * See the enclosed file LICENSE for license information (LGPLv3). If you did
+ * not receive this file, see http://www.gnu.org/licenses/lgpl-3.0.txt
+ *
+ * @author   Maarten Billemont <lhunath@lyndir.com>
+ * @license  http://www.gnu.org/licenses/lgpl-3.0.txt
+ */
+
+//
+//  MPElementModel.h
+//  MPElementModel
+//
+//  Created by lhunath on 2/11/2014.
+//  Copyright, lhunath (Maarten Billemont) 2014. All rights reserved.
+//
+
+#import "MPElementModel.h"
+#import "MPElementEntity.h"
+#import "MPEntities.h"
+#import "MPAppDelegate_Shared.h"
+#import "MPAppDelegate_Store.h"
+#import "MPMacAppDelegate.h"
+
+@interface MPElementModel()
+
+@property(nonatomic, strong) NSManagedObjectID *entityOID;
+@end
+
+@implementation MPElementModel {
+}
+
+- (id)initWithEntity:(MPElementEntity *)entity {
+
+    if (!(self = [super init]))
+        return nil;
+
+    self.site = entity.name;
+    self.lastUsed = entity.lastUsed;
+    self.loginName = entity.loginName;
+    self.type = entity.typeName;
+    self.uses = entity.uses_;
+    self.content = [entity.algorithm resolveContentForElement:entity usingKey:[MPAppDelegate_Shared get].key];
+    self.entityOID = entity.objectID;
+
+    return self;
+}
+
+- (MPElementEntity *)entityForMainThread {
+
+    return [self entityInContext:[MPMacAppDelegate managedObjectContextForMainThreadIfReady]];
+}
+
+- (MPElementEntity *)entityInContext:(NSManagedObjectContext *)moc {
+
+    if (!_entityOID)
+        return nil;
+
+    NSError *error;
+    MPElementEntity *entity = (MPElementEntity *)[moc existingObjectWithID:_entityOID error:&error];
+    if (!entity)
+    err(@"Couldn't retrieve active element: %@", error);
+
+    return entity;
+}
+
+@end

MasterPassword/ObjC/Mac/MPPasswordWindowController.h

@@ -8,15 +8,13 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface MPPasswordWindowController : NSWindowController<NSTextFieldDelegate, NSComboBoxDelegate>
+@interface MPPasswordWindowController : NSWindowController<NSTextFieldDelegate>
 
-@property(nonatomic, weak) IBOutlet NSTextField *siteLabel;
+@property(nonatomic, strong) NSMutableArray *elements;
 @property(nonatomic, weak) IBOutlet NSTextField *siteField;
-@property(nonatomic, weak) IBOutlet NSTextField *contentField;
 @property(nonatomic, weak) IBOutlet NSTextField *tipField;
-@property(nonatomic, weak) IBOutlet NSComboBox *typeField;
 @property(nonatomic, weak) IBOutlet NSView *contentContainer;
-@property(nonatomic, weak) IBOutlet NSProgressIndicator *progressView;
 @property(nonatomic, weak) IBOutlet NSTextField *userLabel;
+@property(nonatomic, weak) IBOutlet NSCollectionView *siteCollectionView;
 
 @end

MasterPassword/ObjC/Mac/MPPasswordWindowController.m

@@ -10,41 +10,38 @@
 #import "MPMacAppDelegate.h"
 #import "MPAppDelegate_Key.h"
 #import "MPAppDelegate_Store.h"
+#import "MPElementModel.h"
 
 #define MPAlertUnlockMP     @"MPAlertUnlockMP"
 #define MPAlertIncorrectMP  @"MPAlertIncorrectMP"
 #define MPAlertCreateSite   @"MPAlertCreateSite"
-#define MPAlertChangeType   @"MPAlertChangeType"
 
 @interface MPPasswordWindowController()
 
 @property(nonatomic) BOOL inProgress;
-@property(nonatomic) BOOL siteFieldPreventCompletion;
 
 @property(nonatomic, strong) NSOperationQueue *backgroundQueue;
 @property(nonatomic, strong) NSAlert *loadingDataAlert;
 @property(nonatomic) BOOL closing;
+
 @end
 
-@implementation MPPasswordWindowController {
+@implementation MPPasswordWindowController
-    NSManagedObjectID *_activeElementOID;
-}
 
 - (void)windowDidLoad {
 
     if ([[MPMacConfig get].dialogStyleHUD boolValue]) {
         self.window.styleMask = NSHUDWindowMask | NSTitledWindowMask | NSUtilityWindowMask | NSClosableWindowMask;
-        self.siteLabel.textColor = [NSColor whiteColor];
+        self.userLabel.textColor = [NSColor whiteColor];
     }
     else {
         self.window.styleMask = NSTexturedBackgroundWindowMask | NSResizableWindowMask | NSTitledWindowMask | NSClosableWindowMask;
-        self.siteLabel.textColor = [NSColor controlTextColor];
+        self.userLabel.textColor = [NSColor controlTextColor];
     }
 
     self.backgroundQueue = [NSOperationQueue new];
     self.backgroundQueue.maxConcurrentOperationCount = 1;
 
-    [self setContent:@""];
     [self.tipField setStringValue:@""];
 
     [self.userLabel setStringValue:PearlString( @"%@'s password for:", [[MPMacAppDelegate get] activeUserForMainThread].name )];
@@ -57,40 +54,39 @@
 //                            @"their passwords to change.  You'll need to update your profile for that site with the new password."];
 //            [moc saveToStore];
 //        }];
-        dispatch_async(dispatch_get_main_queue(), ^{
+        dispatch_async( dispatch_get_main_queue(), ^{
             [self ensureLoadedAndUnlockedOrCloseIfLoggedOut:YES];
-        });
+        } );
     }                             forKeyPath:@"key" options:NSKeyValueObservingOptionInitial context:nil];
     [[NSNotificationCenter defaultCenter] addObserverForName:NSWindowDidBecomeKeyNotification object:self.window
                                                        queue:[NSOperationQueue mainQueue] usingBlock:
-     ^(NSNotification *note) {
+            ^(NSNotification *note) {
-        [self ensureLoadedAndUnlockedOrCloseIfLoggedOut:NO];
+                [self ensureLoadedAndUnlockedOrCloseIfLoggedOut:NO];
-        [self.siteField selectText:nil];
+                [self.siteField selectText:nil];
-    }];
+            }];
     [[NSNotificationCenter defaultCenter] addObserverForName:NSWindowWillCloseNotification object:self.window
                                                        queue:[NSOperationQueue mainQueue] usingBlock:
-     ^(NSNotification *note) {
+            ^(NSNotification *note) {
-         NSWindow *sheet = [self.window attachedSheet];
+                NSWindow *sheet = [self.window attachedSheet];
-         if (sheet)
+                if (sheet)
-             [NSApp endSheet:sheet];
+                    [NSApp endSheet:sheet];
 
-         [NSApp hide:nil];
+                [NSApp hide:nil];
-         self.closing = NO;
+                self.closing = NO;
-     }];
+            }];
     [[NSNotificationCenter defaultCenter] addObserverForName:MPSignedOutNotification object:nil
                                                        queue:[NSOperationQueue mainQueue] usingBlock:
-     ^(NSNotification *note) {
+            ^(NSNotification *note) {
-        _activeElementOID = nil;
+                self.siteField.stringValue = @"";
-        [self.siteField setStringValue:@""];
+                self.elements = nil;
-        [self.typeField deselectItemAtIndex:[self.typeField indexOfSelectedItem]];
+
-        [self trySiteWithAction:NO];
+                [self ensureLoadedAndUnlockedOrCloseIfLoggedOut:YES];
-        [self ensureLoadedAndUnlockedOrCloseIfLoggedOut:YES];
+            }];
-    }];
     [[NSNotificationCenter defaultCenter] addObserverForName:USMStoreDidChangeNotification object:nil
                                                        queue:[NSOperationQueue mainQueue] usingBlock:
-     ^(NSNotification *note) {
+            ^(NSNotification *note) {
-        [self ensureLoadedAndUnlockedOrCloseIfLoggedOut:NO];
+                [self ensureLoadedAndUnlockedOrCloseIfLoggedOut:NO];
-    }];
+            }];
 
     [super windowDidLoad];
 }
@@ -163,9 +159,7 @@
             if ([MPMacAppDelegate get].key)
                 return;
 
-            self.content = @"";
             [self.siteField setStringValue:@""];
-            [self.typeField deselectItemAtIndex:[self.typeField indexOfSelectedItem]];
             [self.tipField setStringValue:@""];
 
             NSAlert *alert = [NSAlert alertWithMessageText:@"Master Password is locked."
@@ -225,7 +219,6 @@
             case NSAlertDefaultReturn: {
                 // "Unlock" button.
                 self.contentContainer.alphaValue = 0;
-                [self.progressView startAnimation:nil];
                 self.inProgress = YES;
 
                 NSString *password = [(NSSecureTextField *)alert.accessoryView stringValue];
@@ -237,8 +230,6 @@
                     self.inProgress = NO;
 
                     dispatch_async( dispatch_get_current_queue(), ^{
-                        [self.progressView stopAnimation:nil];
-
                         if (success)
                             self.contentContainer.alphaValue = 1;
                         else {
@@ -263,8 +254,7 @@
             case NSAlertDefaultReturn: {
                 [[MPMacAppDelegate get] addElementNamed:[self.siteField stringValue] completion:^(MPElementEntity *element) {
                     if (element) {
-                        _activeElementOID = element.objectID;
+                        [self updateElements];
-                        [self trySiteWithAction:NO];
                     }
                 }];
                 break;
@@ -273,78 +263,55 @@
                 break;
         }
     }
-    if (contextInfo == MPAlertChangeType) {
+}
-        switch (returnCode) {
-            case NSAlertDefaultReturn: {
-                MPElementType type = [self selectedType];
-                [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-                    MPElementEntity *activeElement = [self activeElementInContext:context];
-                    _activeElementOID = [[MPMacAppDelegate get] changeElement:activeElement inContext:context
-                                                                       toType:type].objectID;
-                    [context saveToStore];
 
-                    dispatch_async( dispatch_get_main_queue(), ^{
+- (BOOL)control:(NSControl *)control textView:(NSTextView *)fieldEditor doCommandBySelector:(SEL)commandSelector {
-                        [self trySiteWithAction:NO];
+
-                    } );
+    if (commandSelector == @selector(cancel:)) { // Escape without completion.
-                }];
+        [self close];
-                break;
+        return YES;
-            }
-            default:
-                break;
-        }
     }
-}
+//    if ((self.siteFieldPreventCompletion = [NSStringFromSelector( commandSelector ) hasPrefix:@"delete"])) { // Backspace any time.
-
+//        _activeElementOID = nil;
-- (MPElementType)selectedType {
+//        [self trySiteWithAction:NO];
-
+//        return NO;
-    if (self.typeField.indexOfSelectedItem == 0)
+//    }
-        return MPElementTypeGeneratedMaximum;
+    if (commandSelector == @selector(insertNewline:)) { // Return without completion.
-    if (self.typeField.indexOfSelectedItem == 1)
+        [self useSite];
-        return MPElementTypeGeneratedLong;
+        return YES;
-    if (self.typeField.indexOfSelectedItem == 2)
-        return MPElementTypeGeneratedMedium;
-    if (self.typeField.indexOfSelectedItem == 3)
-        return MPElementTypeGeneratedBasic;
-    if (self.typeField.indexOfSelectedItem == 4)
-        return MPElementTypeGeneratedShort;
-    if (self.typeField.indexOfSelectedItem == 5)
-        return MPElementTypeGeneratedPIN;
-    if (self.typeField.indexOfSelectedItem == 6)
-        return MPElementTypeStoredPersonal;
-    if (self.typeField.indexOfSelectedItem == 7)
-        return MPElementTypeStoredDevicePrivate;
-
-    wrn(@"Unsupported type selected: %li, assuming Long.", self.typeField.indexOfSelectedItem);
-    return MPElementTypeGeneratedLong;
-}
-
-- (void)comboBoxSelectionDidChange:(NSNotification *)notification {
-
-    if (notification.object == self.typeField) {
-        if ([self.typeField indexOfSelectedItem] < 0)
-            return;
-        MPElementEntity *activeElement = [self activeElementForMainThread];
-        MPElementType selectedType = [self selectedType];
-        if (!activeElement || activeElement.type == selectedType || !(selectedType & MPElementTypeClassGenerated))
-            return;
-
-        [[NSAlert alertWithMessageText:@"Change Password Type" defaultButton:@"Change Password"
-                       alternateButton:@"Cancel" otherButton:nil
-             informativeTextWithFormat:@"Changing the password type for this site will cause the password to change.\n"
-                     @"You will need to update your account with the new password."]
-                beginSheetModalForWindow:self.window modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
-                             contextInfo:MPAlertChangeType];
     }
+
+    return NO;
 }
 
-- (NSArray *)control:(NSControl *)control textView:(NSTextView *)textView completions:(NSArray *)words
+- (void)controlTextDidChange:(NSNotification *)note {
- forPartialWordRange:(NSRange)charRange indexOfSelectedItem:(NSInteger *)index {
 
-    NSString *query = [[textView string] substringWithRange:charRange];
+    if (note.object != self.siteField)
-    if (![query length] || ![MPMacAppDelegate get].key)
+        return;
-        return nil;
+
+    // Update the site content as the site name changes.
+    if ([[NSApp currentEvent] type] == NSKeyDown &&
+        [[[NSApp currentEvent] charactersIgnoringModifiers] isEqualToString:@"\r"]) { // Return while completing.
+        [self useSite];
+        return;
+    }
+
+//    if ([[NSApp currentEvent] type] == NSKeyDown &&
+//        [[[NSApp currentEvent] charactersIgnoringModifiers] characterAtIndex:0] == 0x1b) { // Escape while completing.
+//        [self trySiteWithAction:NO];
+//        return;
+//    }
+
+    [self updateElements];
+}
+
+- (void)updateElements {
+    NSString *query = [self.siteField.currentEditor string];
+    if (![query length] || ![MPMacAppDelegate get].key) {
+        self.elements = nil;
+        return;
+    }
 
-    __block NSMutableArray *mutableResults = [NSMutableArray array];
     [MPMacAppDelegate managedObjectContextPerformBlockAndWait:^(NSManagedObjectContext *context) {
         NSFetchRequest *fetchRequest = [NSFetchRequest fetchRequestWithEntityName:NSStringFromClass( [MPElementEntity class] )];
         fetchRequest.sortDescriptors = [NSArray arrayWithObject:[[NSSortDescriptor alloc] initWithKey:@"lastUsed" ascending:NO]];
@@ -356,159 +323,83 @@
         if (!siteResults)
         err(@"While fetching elements for completion: %@", error);
         else if ([siteResults count]) {
-            _activeElementOID = ((NSManagedObject *)[siteResults objectAtIndex:0]).objectID;
+            NSMutableArray *newElements = [NSMutableArray arrayWithCapacity:[siteResults count]];
             for (MPElementEntity *element in siteResults)
-                [mutableResults addObject:element.name];
+                [newElements addObject:[[MPElementModel alloc] initWithEntity:element]];
+            self.elements = newElements;
         }
-        else
-            _activeElementOID = nil;
     }];
-
-    if ([mutableResults count] < 2) {
-        //[textView setString:[(MPElementEntity *)[siteResults objectAtIndex:0] name]];
-        //[textView setSelectedRange:NSMakeRange( [query length], [[textView string] length] - [query length] )];
-        [self trySiteWithAction:NO];
-    }
-
-    return mutableResults;
 }
 
-- (BOOL)control:(NSControl *)control textView:(NSTextView *)fieldEditor doCommandBySelector:(SEL)commandSelector {
+- (MPElementModel *)selectedElement {
 
-    if (commandSelector == @selector(cancel:)) { // Escape without completion.
+    NSIndexSet *selectedIndexes = self.siteCollectionView.selectionIndexes;
-        [self close];
+    if (!selectedIndexes.count)
-        return YES;
-    }
-    if ((self.siteFieldPreventCompletion = [NSStringFromSelector( commandSelector ) hasPrefix:@"delete"])) { // Backspace any time.
-        _activeElementOID = nil;
-        [self trySiteWithAction:NO];
-        return NO;
-    }
-    if (commandSelector == @selector(insertNewline:)) { // Return without completion.
-        [self trySiteWithAction:YES];
-        return YES;
-    }
-
-    return NO;
-}
-
-- (void)controlTextDidEndEditing:(NSNotification *)note {
-
-    if (note.object != self.siteField)
-        return;
-
-    [self trySiteWithAction:NO];
-}
-
-- (void)controlTextDidChange:(NSNotification *)note {
-
-    if (note.object != self.siteField)
-        return;
-
-    // Update the site content as the site name changes.
-    if ([[NSApp currentEvent] type] == NSKeyDown &&
-        [[[NSApp currentEvent] charactersIgnoringModifiers] isEqualToString:@"\r"]) { // Return while completing.
-        [self trySiteWithAction:YES];
-        return;
-    }
-
-    if ([[NSApp currentEvent] type] == NSKeyDown &&
-        [[[NSApp currentEvent] charactersIgnoringModifiers] characterAtIndex:0] == 0x1b) { // Escape while completing.
-        _activeElementOID = nil;
-        [self trySiteWithAction:NO];
-        return;
-    }
-
-    if (self.siteFieldPreventCompletion) {
-        self.siteFieldPreventCompletion = NO;
-        return;
-    }
-
-    self.siteFieldPreventCompletion = YES;
-    [(NSText *)[note.userInfo objectForKey:@"NSFieldEditor"] complete:self];
-    self.siteFieldPreventCompletion = NO;
-}
-
-- (MPElementEntity *)activeElementForMainThread {
-
-    return [self activeElementInContext:[MPMacAppDelegate managedObjectContextForMainThreadIfReady]];
-}
-
-- (MPElementEntity *)activeElementInContext:(NSManagedObjectContext *)moc {
-
-    if (!_activeElementOID)
         return nil;
 
-    NSError *error;
+    return (MPElementModel *)self.elements[selectedIndexes.firstIndex];
-    MPElementEntity *activeElement = (MPElementEntity *)[moc existingObjectWithID:_activeElementOID error:&error];
-    if (!activeElement)
-    err(@"Couldn't retrieve active element: %@", error);
-
-    return activeElement;
 }
 
-- (void)setContent:(NSString *)content {
+- (void)useSite {
 
-    NSMutableParagraphStyle *paragraph = [NSMutableParagraphStyle new];
+    MPElementModel *selectedElement = [self selectedElement];
-    paragraph.alignment = NSCenterTextAlignment;
+    if (selectedElement) {
+        // Performing action while content is available.  Copy it.
+        [self copyContent:selectedElement.content];
 
-    [self.contentField setAttributedStringValue:[[NSAttributedString alloc] initWithString:content attributes:@{
+        self.tipField.alphaValue = 1;
-            NSParagraphStyleAttributeName : paragraph
+        self.tipField.stringValue = @"Copied!  Hit ⎋ (ESC) to close window.";
-    }]];
+        dispatch_after( dispatch_time( DISPATCH_TIME_NOW, (int64_t)(5.0f * NSEC_PER_SEC) ), dispatch_get_main_queue(),
-}
+                ^{
-
-- (void)trySiteWithAction:(BOOL)doAction {
-
-    NSString *siteName = [self.siteField stringValue];
-    [self.progressView startAnimation:nil];
-    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-        BOOL actionHandled = NO;
-        MPElementEntity *activeElement = [self activeElementInContext:context];
-        NSString *content = [activeElement.content description];
-        NSString *typeName = [activeElement typeShortName];
-        if (!content)
-            content = @"";
-
-        if (doAction) {
-            if ([content length]) {
-                // Performing action while content is available.  Copy it.
-                [self copyContent:content];
-            }
-            else if ([siteName length]) {
-                // Performing action without content but a site name is written.
-                [self createNewSite:siteName];
-                actionHandled = YES;
-            }
-        }
-
-        [[NSOperationQueue mainQueue] addOperationWithBlock:^{
-            [self setContent:content];
-            [self.progressView stopAnimation:nil];
-            if (![[self.typeField stringValue] isEqualToString:typeName])
-                [self.typeField selectItemWithObjectValue:typeName];
-
-            self.tipField.alphaValue = 1;
-            if (actionHandled)
-                [self.tipField setStringValue:@""];
-            else if ([content length] == 0) {
-                if ([siteName length])
-                    [self.tipField setStringValue:@"Hit ⌤ (ENTER) to create a new site."];
-                else
-                    [self.tipField setStringValue:@""];
-            }
-            else if (!doAction)
-                [self.tipField setStringValue:@"Hit ⌤ (ENTER) to copy the password."];
-            else {
-                [self.tipField setStringValue:@"Copied!  Hit ⎋ (ESC) to close window."];
-                dispatch_after( dispatch_time( DISPATCH_TIME_NOW, (int64_t)(5.0f * NSEC_PER_SEC) ), dispatch_get_main_queue(), ^{
                     [NSAnimationContext beginGrouping];
                     [[NSAnimationContext currentContext] setDuration:0.2f];
                     [self.tipField.animator setAlphaValue:0];
                     [NSAnimationContext endGrouping];
                 } );
-            }
+    }
-        }];
+    else {
-    }];
+        NSString *siteName = [self.siteField stringValue];
+        if ([siteName length]) {
+            // Performing action without content but a site name is written.
+            [self createNewSite:siteName];
+            [self.tipField setStringValue:@""];
+        }
+    }
+
+//    [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+//        MPElementEntity *activeElement = [self activeElementInContext:context];
+//        NSString *typeName = [activeElement typeShortName];
+//        [activeElement.algorithm resolveContentForElement:activeElement usingKey:[MPAppDelegate_Shared get].key result:
+//                ^(NSString *result) {
+//                    BOOL actionHandled = NO;
+//                    if (doAction) {
+//                    }
+//
+//                    [[NSOperationQueue mainQueue] addOperationWithBlock:^{
+//                        [self setContent:result];
+//                        if (actionHandled)
+//                            [self.tipField setStringValue:@""];
+//                        else if (![result length]) {
+//                            if ([siteName length])
+//                                [self.tipField setStringValue:@"Hit ⌤ (ENTER) to create a new site."];
+//                            else
+//                                [self.tipField setStringValue:@""];
+//                        }
+//                        else if (!doAction)
+//                            [self.tipField setStringValue:@"Hit ⌤ (ENTER) to copy the password."];
+//                        else {
+//                            [self.tipField setStringValue:@"Copied!  Hit ⎋ (ESC) to close window."];
+//                            dispatch_after( dispatch_time( DISPATCH_TIME_NOW, (int64_t)(5.0f * NSEC_PER_SEC) ), dispatch_get_main_queue(),
+//                                    ^{
+//                                        [NSAnimationContext beginGrouping];
+//                                        [[NSAnimationContext currentContext] setDuration:0.2f];
+//                                        [self.tipField.animator setAlphaValue:0];
+//                                        [NSAnimationContext endGrouping];
+//                                    } );
+//                        }
+//                    }];
+//                }];
+//    }];
 }
 
 - (void)copyContent:(NSString *)content {
@@ -520,7 +411,7 @@
     }
 
     [MPMacAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *moc) {
-        [[self activeElementInContext:moc] use];
+        [[self.selectedElement entityInContext:moc] use];
         [moc saveToStore];
     }];
 }
@@ -536,4 +427,14 @@
     }];
 }
 
+- (void)insertObject:(MPElementModel *)model inElementsAtIndex:(NSUInteger)index {
+
+    [self.elements insertObject:model atIndex:index];
+}
+
+- (void)removeObjectFromElementsAtIndex:(NSUInteger)index {
+
+    [self.elements removeObjectAtIndex:index];
+}
+
 @end

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

@@ -10,6 +10,8 @@
 		93D392EC39DA43C46C692C12 /* NSDictionary+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */; };
 		93D395F08A087F8A24689347 /* NSArray+Indexing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */; };
 		93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */ = {isa = PBXBuildFile; fileRef = 93D396D04E57792A54D437AC /* NSArray+Indexing.h */; };
+		93D39C5789EFA607CF788082 /* MPElementModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39E73BF5CBF8E5B005CD3 /* MPElementModel.m */; };
+		93D39C7C2BE7C0E0763B0177 /* MPElementCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D394495528B10D1B61A2C3 /* MPElementCollectionView.m */; };
 		93D39E281E3658B30550CB55 /* NSDictionary+Indexing.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */; };
 		DA0933CA1747A56A00DE1CEF /* MPInitialWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA0933C91747A56A00DE1CEF /* MPInitialWindow.xib */; };
 		DA0933CC1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = DA0933CB1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png */; };
@@ -32,15 +34,6 @@
 		DA3EF17D15A47744003ABF4E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DA4425CC1557BED40052177D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5BFA4A147E415C00F98B1E /* Foundation.framework */; };
 		DA4DA1D91564471A00F6F596 /* libjrswizzle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DAC6326C148680650075AEA5 /* libjrswizzle.a */; };
-		DA5E5C8817248AA1003798D8 /* crypto_aesctr.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7B17248AA1003798D8 /* crypto_aesctr.h */; };
-		DA5E5C8917248AA1003798D8 /* crypto_scrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7C17248AA1003798D8 /* crypto_scrypt.h */; };
-		DA5E5C8A17248AA1003798D8 /* memlimit.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7D17248AA1003798D8 /* memlimit.h */; };
-		DA5E5C8B17248AA1003798D8 /* readpass.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7E17248AA1003798D8 /* readpass.h */; };
-		DA5E5C8C17248AA1003798D8 /* scryptenc.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C7F17248AA1003798D8 /* scryptenc.h */; };
-		DA5E5C8D17248AA1003798D8 /* scryptenc_cpuperf.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C8017248AA1003798D8 /* scryptenc_cpuperf.h */; };
-		DA5E5C8E17248AA1003798D8 /* sha256.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C8117248AA1003798D8 /* sha256.h */; };
-		DA5E5C8F17248AA1003798D8 /* sysendian.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C8217248AA1003798D8 /* sysendian.h */; };
-		DA5E5C9017248AA1003798D8 /* warn.h in Headers */ = {isa = PBXBuildFile; fileRef = DA5E5C8317248AA1003798D8 /* warn.h */; };
 		DA5E5C9417248AA1003798D8 /* libscryptenc-osx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */; };
 		DA5E5CF61724A667003798D8 /* MPAlgorithm.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5C981724A667003798D8 /* MPAlgorithm.m */; };
 		DA5E5CF71724A667003798D8 /* MPAlgorithmV0.m in Sources */ = {isa = PBXBuildFile; fileRef = DA5E5C9A1724A667003798D8 /* MPAlgorithmV0.m */; };
@@ -130,6 +123,87 @@
 		DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA298C1705E2BD002C6C22 /* JRSwizzle.m */; };
 		DAD9B5F01762CAA4001835F9 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAD9B5EF1762CAA4001835F9 /* ServiceManagement.framework */; };
 		DAD9B5F11762CAB9001835F9 /* MasterPassword-Mac-LoginHelper.app in Copy LoginHelper */ = {isa = PBXBuildFile; fileRef = DAD9B5E6176299BA001835F9 /* MasterPassword-Mac-LoginHelper.app */; };
+		DAEB93D918AB0FFD000490CC /* aes.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB938718AB0FFD000490CC /* aes.h */; };
+		DAEB93DA18AB0FFD000490CC /* asn1.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB938818AB0FFD000490CC /* asn1.h */; };
+		DAEB93DB18AB0FFD000490CC /* asn1_mac.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB938918AB0FFD000490CC /* asn1_mac.h */; };
+		DAEB93DC18AB0FFD000490CC /* asn1t.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB938A18AB0FFD000490CC /* asn1t.h */; };
+		DAEB93DD18AB0FFD000490CC /* bio.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB938B18AB0FFD000490CC /* bio.h */; };
+		DAEB93DE18AB0FFD000490CC /* blowfish.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB938C18AB0FFD000490CC /* blowfish.h */; };
+		DAEB93DF18AB0FFD000490CC /* bn.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB938D18AB0FFD000490CC /* bn.h */; };
+		DAEB93E018AB0FFD000490CC /* buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB938E18AB0FFD000490CC /* buffer.h */; };
+		DAEB93E118AB0FFD000490CC /* camellia.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB938F18AB0FFD000490CC /* camellia.h */; };
+		DAEB93E218AB0FFD000490CC /* cast.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939018AB0FFD000490CC /* cast.h */; };
+		DAEB93E318AB0FFD000490CC /* cms.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939118AB0FFD000490CC /* cms.h */; };
+		DAEB93E418AB0FFD000490CC /* comp.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939218AB0FFD000490CC /* comp.h */; };
+		DAEB93E518AB0FFD000490CC /* conf.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939318AB0FFD000490CC /* conf.h */; };
+		DAEB93E618AB0FFD000490CC /* conf_api.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939418AB0FFD000490CC /* conf_api.h */; };
+		DAEB93E718AB0FFD000490CC /* crypto.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939518AB0FFD000490CC /* crypto.h */; };
+		DAEB93E818AB0FFD000490CC /* des.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939618AB0FFD000490CC /* des.h */; };
+		DAEB93E918AB0FFD000490CC /* des_old.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939718AB0FFD000490CC /* des_old.h */; };
+		DAEB93EA18AB0FFD000490CC /* dh.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939818AB0FFD000490CC /* dh.h */; };
+		DAEB93EB18AB0FFD000490CC /* dsa.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939918AB0FFD000490CC /* dsa.h */; };
+		DAEB93EC18AB0FFD000490CC /* dso.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939A18AB0FFD000490CC /* dso.h */; };
+		DAEB93ED18AB0FFD000490CC /* dtls1.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939B18AB0FFD000490CC /* dtls1.h */; };
+		DAEB93EE18AB0FFD000490CC /* e_os2.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939C18AB0FFD000490CC /* e_os2.h */; };
+		DAEB93EF18AB0FFD000490CC /* ebcdic.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939D18AB0FFD000490CC /* ebcdic.h */; };
+		DAEB93F018AB0FFD000490CC /* ec.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939E18AB0FFD000490CC /* ec.h */; };
+		DAEB93F118AB0FFD000490CC /* ecdh.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB939F18AB0FFD000490CC /* ecdh.h */; };
+		DAEB93F218AB0FFD000490CC /* ecdsa.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A018AB0FFD000490CC /* ecdsa.h */; };
+		DAEB93F318AB0FFD000490CC /* engine.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A118AB0FFD000490CC /* engine.h */; };
+		DAEB93F418AB0FFD000490CC /* err.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A218AB0FFD000490CC /* err.h */; };
+		DAEB93F518AB0FFD000490CC /* evp.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A318AB0FFD000490CC /* evp.h */; };
+		DAEB93F618AB0FFD000490CC /* hmac.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A418AB0FFD000490CC /* hmac.h */; };
+		DAEB93F718AB0FFD000490CC /* idea.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A518AB0FFD000490CC /* idea.h */; };
+		DAEB93F818AB0FFD000490CC /* krb5_asn.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A618AB0FFD000490CC /* krb5_asn.h */; };
+		DAEB93F918AB0FFD000490CC /* kssl.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A718AB0FFD000490CC /* kssl.h */; };
+		DAEB93FA18AB0FFD000490CC /* lhash.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A818AB0FFD000490CC /* lhash.h */; };
+		DAEB93FB18AB0FFD000490CC /* md4.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93A918AB0FFD000490CC /* md4.h */; };
+		DAEB93FC18AB0FFD000490CC /* md5.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93AA18AB0FFD000490CC /* md5.h */; };
+		DAEB93FD18AB0FFD000490CC /* mdc2.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93AB18AB0FFD000490CC /* mdc2.h */; };
+		DAEB93FE18AB0FFD000490CC /* modes.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93AC18AB0FFD000490CC /* modes.h */; };
+		DAEB93FF18AB0FFD000490CC /* obj_mac.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93AD18AB0FFD000490CC /* obj_mac.h */; };
+		DAEB940018AB0FFD000490CC /* objects.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93AE18AB0FFD000490CC /* objects.h */; };
+		DAEB940118AB0FFD000490CC /* ocsp.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93AF18AB0FFD000490CC /* ocsp.h */; };
+		DAEB940218AB0FFD000490CC /* opensslconf.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B018AB0FFD000490CC /* opensslconf.h */; };
+		DAEB940318AB0FFD000490CC /* opensslv.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B118AB0FFD000490CC /* opensslv.h */; };
+		DAEB940418AB0FFD000490CC /* ossl_typ.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B218AB0FFD000490CC /* ossl_typ.h */; };
+		DAEB940518AB0FFD000490CC /* pem.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B318AB0FFD000490CC /* pem.h */; };
+		DAEB940618AB0FFD000490CC /* pem2.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B418AB0FFD000490CC /* pem2.h */; };
+		DAEB940718AB0FFD000490CC /* pkcs12.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B518AB0FFD000490CC /* pkcs12.h */; };
+		DAEB940818AB0FFD000490CC /* pkcs7.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B618AB0FFD000490CC /* pkcs7.h */; };
+		DAEB940918AB0FFD000490CC /* pqueue.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B718AB0FFD000490CC /* pqueue.h */; };
+		DAEB940A18AB0FFD000490CC /* rand.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B818AB0FFD000490CC /* rand.h */; };
+		DAEB940B18AB0FFD000490CC /* rc2.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93B918AB0FFD000490CC /* rc2.h */; };
+		DAEB940C18AB0FFD000490CC /* rc4.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93BA18AB0FFD000490CC /* rc4.h */; };
+		DAEB940D18AB0FFD000490CC /* ripemd.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93BB18AB0FFD000490CC /* ripemd.h */; };
+		DAEB940E18AB0FFD000490CC /* rsa.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93BC18AB0FFD000490CC /* rsa.h */; };
+		DAEB940F18AB0FFD000490CC /* safestack.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93BD18AB0FFD000490CC /* safestack.h */; };
+		DAEB941018AB0FFD000490CC /* seed.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93BE18AB0FFD000490CC /* seed.h */; };
+		DAEB941118AB0FFD000490CC /* sha.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93BF18AB0FFD000490CC /* sha.h */; };
+		DAEB941218AB0FFD000490CC /* ssl.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C018AB0FFD000490CC /* ssl.h */; };
+		DAEB941318AB0FFD000490CC /* ssl2.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C118AB0FFD000490CC /* ssl2.h */; };
+		DAEB941418AB0FFD000490CC /* ssl23.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C218AB0FFD000490CC /* ssl23.h */; };
+		DAEB941518AB0FFD000490CC /* ssl3.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C318AB0FFD000490CC /* ssl3.h */; };
+		DAEB941618AB0FFD000490CC /* stack.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C418AB0FFD000490CC /* stack.h */; };
+		DAEB941718AB0FFD000490CC /* symhacks.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C518AB0FFD000490CC /* symhacks.h */; };
+		DAEB941818AB0FFD000490CC /* tls1.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C618AB0FFD000490CC /* tls1.h */; };
+		DAEB941918AB0FFD000490CC /* ts.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C718AB0FFD000490CC /* ts.h */; };
+		DAEB941A18AB0FFD000490CC /* txt_db.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C818AB0FFD000490CC /* txt_db.h */; };
+		DAEB941B18AB0FFD000490CC /* ui.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93C918AB0FFD000490CC /* ui.h */; };
+		DAEB941C18AB0FFD000490CC /* ui_compat.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93CA18AB0FFD000490CC /* ui_compat.h */; };
+		DAEB941D18AB0FFD000490CC /* whrlpool.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93CB18AB0FFD000490CC /* whrlpool.h */; };
+		DAEB941E18AB0FFD000490CC /* x509.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93CC18AB0FFD000490CC /* x509.h */; };
+		DAEB941F18AB0FFD000490CC /* x509_vfy.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93CD18AB0FFD000490CC /* x509_vfy.h */; };
+		DAEB942018AB0FFD000490CC /* x509v3.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93CE18AB0FFD000490CC /* x509v3.h */; };
+		DAEB942118AB0FFD000490CC /* crypto_aesctr.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93D018AB0FFD000490CC /* crypto_aesctr.h */; };
+		DAEB942218AB0FFD000490CC /* crypto_scrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93D118AB0FFD000490CC /* crypto_scrypt.h */; };
+		DAEB942318AB0FFD000490CC /* memlimit.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93D218AB0FFD000490CC /* memlimit.h */; };
+		DAEB942418AB0FFD000490CC /* readpass.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93D318AB0FFD000490CC /* readpass.h */; };
+		DAEB942518AB0FFD000490CC /* scryptenc.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93D418AB0FFD000490CC /* scryptenc.h */; };
+		DAEB942618AB0FFD000490CC /* scryptenc_cpuperf.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93D518AB0FFD000490CC /* scryptenc_cpuperf.h */; };
+		DAEB942718AB0FFD000490CC /* sha256.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93D618AB0FFD000490CC /* sha256.h */; };
+		DAEB942818AB0FFD000490CC /* sysendian.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93D718AB0FFD000490CC /* sysendian.h */; };
+		DAEB942918AB0FFD000490CC /* warn.h in Headers */ = {isa = PBXBuildFile; fileRef = DAEB93D818AB0FFD000490CC /* warn.h */; };
 		DAFE4A1315039824003ABA7C /* NSObject+PearlExport.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */; };
 		DAFE4A1415039824003ABA7C /* NSObject+PearlExport.m in Sources */ = {isa = PBXBuildFile; fileRef = DAFE45D915039823003ABA7C /* NSObject+PearlExport.m */; };
 		DAFE4A1515039824003ABA7C /* NSString+PearlNSArrayFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = DAFE45DA15039823003ABA7C /* NSString+PearlNSArrayFormat.h */; };
@@ -221,9 +295,13 @@
 
 /* Begin PBXFileReference section */
 		93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+Indexing.m"; sourceTree = "<group>"; };
+		93D39240B5143E01F0B75E96 /* MPElementModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPElementModel.h; sourceTree = "<group>"; };
 		93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+Indexing.h"; sourceTree = "<group>"; };
+		93D394495528B10D1B61A2C3 /* MPElementCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPElementCollectionView.m; sourceTree = "<group>"; };
+		93D3960D320FF8A072B092E3 /* MPElementCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPElementCollectionView.h; sourceTree = "<group>"; };
 		93D396D04E57792A54D437AC /* NSArray+Indexing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Indexing.h"; sourceTree = "<group>"; };
 		93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+Indexing.m"; sourceTree = "<group>"; };
+		93D39E73BF5CBF8E5B005CD3 /* MPElementModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPElementModel.m; sourceTree = "<group>"; };
 		DA0933C91747A56A00DE1CEF /* MPInitialWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MPInitialWindow.xib; sourceTree = "<group>"; };
 		DA0933CB1747AD2D00DE1CEF /* shot-laptop-leaning-iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "shot-laptop-leaning-iphone.png"; sourceTree = "<group>"; };
 		DA0933CF1747B91B00DE1CEF /* appstore.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = appstore.png; sourceTree = "<group>"; };
@@ -245,15 +323,6 @@
 		DA5BFA4A147E415C00F98B1E /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		DA5BFA4C147E415C00F98B1E /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		DA5BFA4E147E415C00F98B1E /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
-		DA5E5C7B17248AA1003798D8 /* crypto_aesctr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aesctr.h; sourceTree = "<group>"; };
-		DA5E5C7C17248AA1003798D8 /* crypto_scrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scrypt.h; sourceTree = "<group>"; };
-		DA5E5C7D17248AA1003798D8 /* memlimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memlimit.h; sourceTree = "<group>"; };
-		DA5E5C7E17248AA1003798D8 /* readpass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = readpass.h; sourceTree = "<group>"; };
-		DA5E5C7F17248AA1003798D8 /* scryptenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc.h; sourceTree = "<group>"; };
-		DA5E5C8017248AA1003798D8 /* scryptenc_cpuperf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc_cpuperf.h; sourceTree = "<group>"; };
-		DA5E5C8117248AA1003798D8 /* sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha256.h; sourceTree = "<group>"; };
-		DA5E5C8217248AA1003798D8 /* sysendian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysendian.h; sourceTree = "<group>"; };
-		DA5E5C8317248AA1003798D8 /* warn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = warn.h; sourceTree = "<group>"; };
 		DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-osx.a"; sourceTree = "<group>"; };
 		DA5E5C971724A667003798D8 /* MPAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAlgorithm.h; sourceTree = "<group>"; };
 		DA5E5C981724A667003798D8 /* MPAlgorithm.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAlgorithm.m; sourceTree = "<group>"; };
@@ -373,6 +442,87 @@
 		DAD312C01552A20800A3F9ED /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
 		DAD9B5E1176299B9001835F9 /* MasterPassword-Mac-LoginHelper.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "MasterPassword-Mac-LoginHelper.xcodeproj"; path = "MasterPassword-Mac-LoginHelper/MasterPassword-Mac-LoginHelper.xcodeproj"; sourceTree = "<group>"; };
 		DAD9B5EF1762CAA4001835F9 /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
+		DAEB938718AB0FFD000490CC /* aes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aes.h; sourceTree = "<group>"; };
+		DAEB938818AB0FFD000490CC /* asn1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asn1.h; sourceTree = "<group>"; };
+		DAEB938918AB0FFD000490CC /* asn1_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asn1_mac.h; sourceTree = "<group>"; };
+		DAEB938A18AB0FFD000490CC /* asn1t.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asn1t.h; sourceTree = "<group>"; };
+		DAEB938B18AB0FFD000490CC /* bio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bio.h; sourceTree = "<group>"; };
+		DAEB938C18AB0FFD000490CC /* blowfish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = blowfish.h; sourceTree = "<group>"; };
+		DAEB938D18AB0FFD000490CC /* bn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bn.h; sourceTree = "<group>"; };
+		DAEB938E18AB0FFD000490CC /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buffer.h; sourceTree = "<group>"; };
+		DAEB938F18AB0FFD000490CC /* camellia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = camellia.h; sourceTree = "<group>"; };
+		DAEB939018AB0FFD000490CC /* cast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cast.h; sourceTree = "<group>"; };
+		DAEB939118AB0FFD000490CC /* cms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cms.h; sourceTree = "<group>"; };
+		DAEB939218AB0FFD000490CC /* comp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = comp.h; sourceTree = "<group>"; };
+		DAEB939318AB0FFD000490CC /* conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conf.h; sourceTree = "<group>"; };
+		DAEB939418AB0FFD000490CC /* conf_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conf_api.h; sourceTree = "<group>"; };
+		DAEB939518AB0FFD000490CC /* crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto.h; sourceTree = "<group>"; };
+		DAEB939618AB0FFD000490CC /* des.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = des.h; sourceTree = "<group>"; };
+		DAEB939718AB0FFD000490CC /* des_old.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = des_old.h; sourceTree = "<group>"; };
+		DAEB939818AB0FFD000490CC /* dh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dh.h; sourceTree = "<group>"; };
+		DAEB939918AB0FFD000490CC /* dsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsa.h; sourceTree = "<group>"; };
+		DAEB939A18AB0FFD000490CC /* dso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dso.h; sourceTree = "<group>"; };
+		DAEB939B18AB0FFD000490CC /* dtls1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dtls1.h; sourceTree = "<group>"; };
+		DAEB939C18AB0FFD000490CC /* e_os2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = e_os2.h; sourceTree = "<group>"; };
+		DAEB939D18AB0FFD000490CC /* ebcdic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ebcdic.h; sourceTree = "<group>"; };
+		DAEB939E18AB0FFD000490CC /* ec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ec.h; sourceTree = "<group>"; };
+		DAEB939F18AB0FFD000490CC /* ecdh.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ecdh.h; sourceTree = "<group>"; };
+		DAEB93A018AB0FFD000490CC /* ecdsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ecdsa.h; sourceTree = "<group>"; };
+		DAEB93A118AB0FFD000490CC /* engine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = engine.h; sourceTree = "<group>"; };
+		DAEB93A218AB0FFD000490CC /* err.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = err.h; sourceTree = "<group>"; };
+		DAEB93A318AB0FFD000490CC /* evp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = evp.h; sourceTree = "<group>"; };
+		DAEB93A418AB0FFD000490CC /* hmac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hmac.h; sourceTree = "<group>"; };
+		DAEB93A518AB0FFD000490CC /* idea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = idea.h; sourceTree = "<group>"; };
+		DAEB93A618AB0FFD000490CC /* krb5_asn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = krb5_asn.h; sourceTree = "<group>"; };
+		DAEB93A718AB0FFD000490CC /* kssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kssl.h; sourceTree = "<group>"; };
+		DAEB93A818AB0FFD000490CC /* lhash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lhash.h; sourceTree = "<group>"; };
+		DAEB93A918AB0FFD000490CC /* md4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md4.h; sourceTree = "<group>"; };
+		DAEB93AA18AB0FFD000490CC /* md5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md5.h; sourceTree = "<group>"; };
+		DAEB93AB18AB0FFD000490CC /* mdc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mdc2.h; sourceTree = "<group>"; };
+		DAEB93AC18AB0FFD000490CC /* modes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = modes.h; sourceTree = "<group>"; };
+		DAEB93AD18AB0FFD000490CC /* obj_mac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = obj_mac.h; sourceTree = "<group>"; };
+		DAEB93AE18AB0FFD000490CC /* objects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = objects.h; sourceTree = "<group>"; };
+		DAEB93AF18AB0FFD000490CC /* ocsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ocsp.h; sourceTree = "<group>"; };
+		DAEB93B018AB0FFD000490CC /* opensslconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opensslconf.h; sourceTree = "<group>"; };
+		DAEB93B118AB0FFD000490CC /* opensslv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opensslv.h; sourceTree = "<group>"; };
+		DAEB93B218AB0FFD000490CC /* ossl_typ.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ossl_typ.h; sourceTree = "<group>"; };
+		DAEB93B318AB0FFD000490CC /* pem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pem.h; sourceTree = "<group>"; };
+		DAEB93B418AB0FFD000490CC /* pem2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pem2.h; sourceTree = "<group>"; };
+		DAEB93B518AB0FFD000490CC /* pkcs12.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pkcs12.h; sourceTree = "<group>"; };
+		DAEB93B618AB0FFD000490CC /* pkcs7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pkcs7.h; sourceTree = "<group>"; };
+		DAEB93B718AB0FFD000490CC /* pqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pqueue.h; sourceTree = "<group>"; };
+		DAEB93B818AB0FFD000490CC /* rand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rand.h; sourceTree = "<group>"; };
+		DAEB93B918AB0FFD000490CC /* rc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rc2.h; sourceTree = "<group>"; };
+		DAEB93BA18AB0FFD000490CC /* rc4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rc4.h; sourceTree = "<group>"; };
+		DAEB93BB18AB0FFD000490CC /* ripemd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ripemd.h; sourceTree = "<group>"; };
+		DAEB93BC18AB0FFD000490CC /* rsa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rsa.h; sourceTree = "<group>"; };
+		DAEB93BD18AB0FFD000490CC /* safestack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = safestack.h; sourceTree = "<group>"; };
+		DAEB93BE18AB0FFD000490CC /* seed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = seed.h; sourceTree = "<group>"; };
+		DAEB93BF18AB0FFD000490CC /* sha.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha.h; sourceTree = "<group>"; };
+		DAEB93C018AB0FFD000490CC /* ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl.h; sourceTree = "<group>"; };
+		DAEB93C118AB0FFD000490CC /* ssl2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl2.h; sourceTree = "<group>"; };
+		DAEB93C218AB0FFD000490CC /* ssl23.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl23.h; sourceTree = "<group>"; };
+		DAEB93C318AB0FFD000490CC /* ssl3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ssl3.h; sourceTree = "<group>"; };
+		DAEB93C418AB0FFD000490CC /* stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stack.h; sourceTree = "<group>"; };
+		DAEB93C518AB0FFD000490CC /* symhacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = symhacks.h; sourceTree = "<group>"; };
+		DAEB93C618AB0FFD000490CC /* tls1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tls1.h; sourceTree = "<group>"; };
+		DAEB93C718AB0FFD000490CC /* ts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ts.h; sourceTree = "<group>"; };
+		DAEB93C818AB0FFD000490CC /* txt_db.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = txt_db.h; sourceTree = "<group>"; };
+		DAEB93C918AB0FFD000490CC /* ui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui.h; sourceTree = "<group>"; };
+		DAEB93CA18AB0FFD000490CC /* ui_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_compat.h; sourceTree = "<group>"; };
+		DAEB93CB18AB0FFD000490CC /* whrlpool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = whrlpool.h; sourceTree = "<group>"; };
+		DAEB93CC18AB0FFD000490CC /* x509.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509.h; sourceTree = "<group>"; };
+		DAEB93CD18AB0FFD000490CC /* x509_vfy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509_vfy.h; sourceTree = "<group>"; };
+		DAEB93CE18AB0FFD000490CC /* x509v3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x509v3.h; sourceTree = "<group>"; };
+		DAEB93D018AB0FFD000490CC /* crypto_aesctr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_aesctr.h; sourceTree = "<group>"; };
+		DAEB93D118AB0FFD000490CC /* crypto_scrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scrypt.h; sourceTree = "<group>"; };
+		DAEB93D218AB0FFD000490CC /* memlimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memlimit.h; sourceTree = "<group>"; };
+		DAEB93D318AB0FFD000490CC /* readpass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = readpass.h; sourceTree = "<group>"; };
+		DAEB93D418AB0FFD000490CC /* scryptenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc.h; sourceTree = "<group>"; };
+		DAEB93D518AB0FFD000490CC /* scryptenc_cpuperf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scryptenc_cpuperf.h; sourceTree = "<group>"; };
+		DAEB93D618AB0FFD000490CC /* sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha256.h; sourceTree = "<group>"; };
+		DAEB93D718AB0FFD000490CC /* sysendian.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysendian.h; sourceTree = "<group>"; };
+		DAEB93D818AB0FFD000490CC /* warn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = warn.h; sourceTree = "<group>"; };
 		DAEBC45214F6364500987BF6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+PearlExport.h"; sourceTree = "<group>"; };
 		DAFE45D915039823003ABA7C /* NSObject+PearlExport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+PearlExport.m"; sourceTree = "<group>"; };
@@ -530,28 +680,12 @@
 		DA5E5C7917248AA1003798D8 /* lib */ = {
 			isa = PBXGroup;
 			children = (
-				DA5E5C7A17248AA1003798D8 /* include */,
+				DAEB938518AB0FFD000490CC /* include */,
 				DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */,
 			);
 			path = lib;
 			sourceTree = "<group>";
 		};
-		DA5E5C7A17248AA1003798D8 /* include */ = {
-			isa = PBXGroup;
-			children = (
-				DA5E5C7B17248AA1003798D8 /* crypto_aesctr.h */,
-				DA5E5C7C17248AA1003798D8 /* crypto_scrypt.h */,
-				DA5E5C7D17248AA1003798D8 /* memlimit.h */,
-				DA5E5C7E17248AA1003798D8 /* readpass.h */,
-				DA5E5C7F17248AA1003798D8 /* scryptenc.h */,
-				DA5E5C8017248AA1003798D8 /* scryptenc_cpuperf.h */,
-				DA5E5C8117248AA1003798D8 /* sha256.h */,
-				DA5E5C8217248AA1003798D8 /* sysendian.h */,
-				DA5E5C8317248AA1003798D8 /* warn.h */,
-			);
-			path = include;
-			sourceTree = "<group>";
-		};
 		DA5E5C961724A667003798D8 /* ObjC */ = {
 			isa = PBXGroup;
 			children = (
@@ -608,6 +742,10 @@
 				DA5E5CC41724A667003798D8 /* MainMenu.xib */,
 				DA5E5CC61724A667003798D8 /* main.m */,
 				DA0933C91747A56A00DE1CEF /* MPInitialWindow.xib */,
+				93D394495528B10D1B61A2C3 /* MPElementCollectionView.m */,
+				93D3960D320FF8A072B092E3 /* MPElementCollectionView.h */,
+				93D39E73BF5CBF8E5B005CD3 /* MPElementModel.m */,
+				93D39240B5143E01F0B75E96 /* MPElementModel.h */,
 			);
 			path = Mac;
 			sourceTree = "<group>";
@@ -793,6 +931,110 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		DAEB938518AB0FFD000490CC /* include */ = {
+			isa = PBXGroup;
+			children = (
+				DAEB938618AB0FFD000490CC /* openssl */,
+				DAEB93CF18AB0FFD000490CC /* scrypt */,
+			);
+			path = include;
+			sourceTree = "<group>";
+		};
+		DAEB938618AB0FFD000490CC /* openssl */ = {
+			isa = PBXGroup;
+			children = (
+				DAEB938718AB0FFD000490CC /* aes.h */,
+				DAEB938818AB0FFD000490CC /* asn1.h */,
+				DAEB938918AB0FFD000490CC /* asn1_mac.h */,
+				DAEB938A18AB0FFD000490CC /* asn1t.h */,
+				DAEB938B18AB0FFD000490CC /* bio.h */,
+				DAEB938C18AB0FFD000490CC /* blowfish.h */,
+				DAEB938D18AB0FFD000490CC /* bn.h */,
+				DAEB938E18AB0FFD000490CC /* buffer.h */,
+				DAEB938F18AB0FFD000490CC /* camellia.h */,
+				DAEB939018AB0FFD000490CC /* cast.h */,
+				DAEB939118AB0FFD000490CC /* cms.h */,
+				DAEB939218AB0FFD000490CC /* comp.h */,
+				DAEB939318AB0FFD000490CC /* conf.h */,
+				DAEB939418AB0FFD000490CC /* conf_api.h */,
+				DAEB939518AB0FFD000490CC /* crypto.h */,
+				DAEB939618AB0FFD000490CC /* des.h */,
+				DAEB939718AB0FFD000490CC /* des_old.h */,
+				DAEB939818AB0FFD000490CC /* dh.h */,
+				DAEB939918AB0FFD000490CC /* dsa.h */,
+				DAEB939A18AB0FFD000490CC /* dso.h */,
+				DAEB939B18AB0FFD000490CC /* dtls1.h */,
+				DAEB939C18AB0FFD000490CC /* e_os2.h */,
+				DAEB939D18AB0FFD000490CC /* ebcdic.h */,
+				DAEB939E18AB0FFD000490CC /* ec.h */,
+				DAEB939F18AB0FFD000490CC /* ecdh.h */,
+				DAEB93A018AB0FFD000490CC /* ecdsa.h */,
+				DAEB93A118AB0FFD000490CC /* engine.h */,
+				DAEB93A218AB0FFD000490CC /* err.h */,
+				DAEB93A318AB0FFD000490CC /* evp.h */,
+				DAEB93A418AB0FFD000490CC /* hmac.h */,
+				DAEB93A518AB0FFD000490CC /* idea.h */,
+				DAEB93A618AB0FFD000490CC /* krb5_asn.h */,
+				DAEB93A718AB0FFD000490CC /* kssl.h */,
+				DAEB93A818AB0FFD000490CC /* lhash.h */,
+				DAEB93A918AB0FFD000490CC /* md4.h */,
+				DAEB93AA18AB0FFD000490CC /* md5.h */,
+				DAEB93AB18AB0FFD000490CC /* mdc2.h */,
+				DAEB93AC18AB0FFD000490CC /* modes.h */,
+				DAEB93AD18AB0FFD000490CC /* obj_mac.h */,
+				DAEB93AE18AB0FFD000490CC /* objects.h */,
+				DAEB93AF18AB0FFD000490CC /* ocsp.h */,
+				DAEB93B018AB0FFD000490CC /* opensslconf.h */,
+				DAEB93B118AB0FFD000490CC /* opensslv.h */,
+				DAEB93B218AB0FFD000490CC /* ossl_typ.h */,
+				DAEB93B318AB0FFD000490CC /* pem.h */,
+				DAEB93B418AB0FFD000490CC /* pem2.h */,
+				DAEB93B518AB0FFD000490CC /* pkcs12.h */,
+				DAEB93B618AB0FFD000490CC /* pkcs7.h */,
+				DAEB93B718AB0FFD000490CC /* pqueue.h */,
+				DAEB93B818AB0FFD000490CC /* rand.h */,
+				DAEB93B918AB0FFD000490CC /* rc2.h */,
+				DAEB93BA18AB0FFD000490CC /* rc4.h */,
+				DAEB93BB18AB0FFD000490CC /* ripemd.h */,
+				DAEB93BC18AB0FFD000490CC /* rsa.h */,
+				DAEB93BD18AB0FFD000490CC /* safestack.h */,
+				DAEB93BE18AB0FFD000490CC /* seed.h */,
+				DAEB93BF18AB0FFD000490CC /* sha.h */,
+				DAEB93C018AB0FFD000490CC /* ssl.h */,
+				DAEB93C118AB0FFD000490CC /* ssl2.h */,
+				DAEB93C218AB0FFD000490CC /* ssl23.h */,
+				DAEB93C318AB0FFD000490CC /* ssl3.h */,
+				DAEB93C418AB0FFD000490CC /* stack.h */,
+				DAEB93C518AB0FFD000490CC /* symhacks.h */,
+				DAEB93C618AB0FFD000490CC /* tls1.h */,
+				DAEB93C718AB0FFD000490CC /* ts.h */,
+				DAEB93C818AB0FFD000490CC /* txt_db.h */,
+				DAEB93C918AB0FFD000490CC /* ui.h */,
+				DAEB93CA18AB0FFD000490CC /* ui_compat.h */,
+				DAEB93CB18AB0FFD000490CC /* whrlpool.h */,
+				DAEB93CC18AB0FFD000490CC /* x509.h */,
+				DAEB93CD18AB0FFD000490CC /* x509_vfy.h */,
+				DAEB93CE18AB0FFD000490CC /* x509v3.h */,
+			);
+			path = openssl;
+			sourceTree = "<group>";
+		};
+		DAEB93CF18AB0FFD000490CC /* scrypt */ = {
+			isa = PBXGroup;
+			children = (
+				DAEB93D018AB0FFD000490CC /* crypto_aesctr.h */,
+				DAEB93D118AB0FFD000490CC /* crypto_scrypt.h */,
+				DAEB93D218AB0FFD000490CC /* memlimit.h */,
+				DAEB93D318AB0FFD000490CC /* readpass.h */,
+				DAEB93D418AB0FFD000490CC /* scryptenc.h */,
+				DAEB93D518AB0FFD000490CC /* scryptenc_cpuperf.h */,
+				DAEB93D618AB0FFD000490CC /* sha256.h */,
+				DAEB93D718AB0FFD000490CC /* sysendian.h */,
+				DAEB93D818AB0FFD000490CC /* warn.h */,
+			);
+			path = scrypt;
+			sourceTree = "<group>";
+		};
 		DAFE45D715039823003ABA7C /* Pearl */ = {
 			isa = PBXGroup;
 			children = (
@@ -896,42 +1138,114 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DAEB941818AB0FFD000490CC /* tls1.h in Headers */,
+				DAEB940C18AB0FFD000490CC /* rc4.h in Headers */,
+				DAEB93F418AB0FFD000490CC /* err.h in Headers */,
+				DAEB93F118AB0FFD000490CC /* ecdh.h in Headers */,
+				DAEB93FD18AB0FFD000490CC /* mdc2.h in Headers */,
+				DAEB942718AB0FFD000490CC /* sha256.h in Headers */,
+				DAEB940818AB0FFD000490CC /* pkcs7.h in Headers */,
+				DAEB93DF18AB0FFD000490CC /* bn.h in Headers */,
+				DAEB940718AB0FFD000490CC /* pkcs12.h in Headers */,
+				DAEB941A18AB0FFD000490CC /* txt_db.h in Headers */,
 				DAFE4A1315039824003ABA7C /* NSObject+PearlExport.h in Headers */,
 				DAFE4A1515039824003ABA7C /* NSString+PearlNSArrayFormat.h in Headers */,
+				DAEB942218AB0FFD000490CC /* crypto_scrypt.h in Headers */,
+				DAEB941018AB0FFD000490CC /* seed.h in Headers */,
+				DAEB942618AB0FFD000490CC /* scryptenc_cpuperf.h in Headers */,
 				DAFE4A1715039824003ABA7C /* NSString+PearlSEL.h in Headers */,
+				DAEB93F518AB0FFD000490CC /* evp.h in Headers */,
+				DAEB941918AB0FFD000490CC /* ts.h in Headers */,
+				DAEB93F818AB0FFD000490CC /* krb5_asn.h in Headers */,
 				DAFE4A1915039824003ABA7C /* Pearl.h in Headers */,
+				DAEB93F318AB0FFD000490CC /* engine.h in Headers */,
 				DAFE4A1A15039824003ABA7C /* PearlAbstractStrings.h in Headers */,
 				DAFE4A1E15039824003ABA7C /* PearlCodeUtils.h in Headers */,
+				DAEB940918AB0FFD000490CC /* pqueue.h in Headers */,
 				DAFE4A2015039824003ABA7C /* PearlConfig.h in Headers */,
+				DAEB941B18AB0FFD000490CC /* ui.h in Headers */,
+				DAEB941D18AB0FFD000490CC /* whrlpool.h in Headers */,
+				DAEB940418AB0FFD000490CC /* ossl_typ.h in Headers */,
+				DAEB93DC18AB0FFD000490CC /* asn1t.h in Headers */,
 				DAFE4A2215039824003ABA7C /* PearlDeviceUtils.h in Headers */,
+				DAEB93E518AB0FFD000490CC /* conf.h in Headers */,
 				DAFE4A2415039824003ABA7C /* PearlInfoPlist.h in Headers */,
+				DAEB940618AB0FFD000490CC /* pem2.h in Headers */,
 				DAFE4A2615039824003ABA7C /* PearlLogger.h in Headers */,
+				DAEB93FC18AB0FFD000490CC /* md5.h in Headers */,
 				DAFE4A2815039824003ABA7C /* PearlMathUtils.h in Headers */,
 				DAFE4A2A15039824003ABA7C /* PearlObjectUtils.h in Headers */,
+				DAEB93E318AB0FFD000490CC /* cms.h in Headers */,
+				DAEB942518AB0FFD000490CC /* scryptenc.h in Headers */,
+				DAEB93FA18AB0FFD000490CC /* lhash.h in Headers */,
 				DAFE4A2C15039824003ABA7C /* PearlResettable.h in Headers */,
+				DAEB940B18AB0FFD000490CC /* rc2.h in Headers */,
 				DAFE4A2D15039824003ABA7C /* PearlStrings.h in Headers */,
+				DAEB93DA18AB0FFD000490CC /* asn1.h in Headers */,
+				DAEB93EA18AB0FFD000490CC /* dh.h in Headers */,
+				DAEB93F918AB0FFD000490CC /* kssl.h in Headers */,
 				DAFE4A2F15039824003ABA7C /* PearlStringUtils.h in Headers */,
+				DAEB940318AB0FFD000490CC /* opensslv.h in Headers */,
+				DAEB93ED18AB0FFD000490CC /* dtls1.h in Headers */,
+				DAEB93E018AB0FFD000490CC /* buffer.h in Headers */,
+				DAEB940218AB0FFD000490CC /* opensslconf.h in Headers */,
+				DAEB93E918AB0FFD000490CC /* des_old.h in Headers */,
 				DAFE4A3315039824003ABA7C /* Pearl-Crypto.h in Headers */,
+				DAEB941C18AB0FFD000490CC /* ui_compat.h in Headers */,
+				DAEB93E218AB0FFD000490CC /* cast.h in Headers */,
+				DAEB942318AB0FFD000490CC /* memlimit.h in Headers */,
 				DAFE4A3415039824003ABA7C /* PearlCryptUtils.h in Headers */,
+				DAEB940018AB0FFD000490CC /* objects.h in Headers */,
+				DAEB93E818AB0FFD000490CC /* des.h in Headers */,
+				DAEB941418AB0FFD000490CC /* ssl23.h in Headers */,
+				DAEB93EB18AB0FFD000490CC /* dsa.h in Headers */,
+				DAEB941218AB0FFD000490CC /* ssl.h in Headers */,
+				DAEB93FE18AB0FFD000490CC /* modes.h in Headers */,
+				DAEB940A18AB0FFD000490CC /* rand.h in Headers */,
+				DAEB93EE18AB0FFD000490CC /* e_os2.h in Headers */,
+				DAEB940E18AB0FFD000490CC /* rsa.h in Headers */,
+				DAEB93E618AB0FFD000490CC /* conf_api.h in Headers */,
 				DAFE4A3615039824003ABA7C /* PearlKeyChain.h in Headers */,
+				DAEB941518AB0FFD000490CC /* ssl3.h in Headers */,
+				DAEB941618AB0FFD000490CC /* stack.h in Headers */,
 				DAFE4A3815039824003ABA7C /* PearlRSAKey.h in Headers */,
+				DAEB93DD18AB0FFD000490CC /* bio.h in Headers */,
+				DAEB942418AB0FFD000490CC /* readpass.h in Headers */,
+				DAEB93F018AB0FFD000490CC /* ec.h in Headers */,
+				DAEB93E418AB0FFD000490CC /* comp.h in Headers */,
 				DAFE4A3A15039824003ABA7C /* PearlSCrypt.h in Headers */,
+				DAEB93D918AB0FFD000490CC /* aes.h in Headers */,
 				DA30E9CE15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h in Headers */,
+				DAEB93FB18AB0FFD000490CC /* md4.h in Headers */,
+				DAEB941118AB0FFD000490CC /* sha.h in Headers */,
+				DAEB941F18AB0FFD000490CC /* x509_vfy.h in Headers */,
 				DA30E9D715723E6900A68B4C /* PearlLazy.h in Headers */,
+				DAEB93EC18AB0FFD000490CC /* dso.h in Headers */,
+				DAEB940118AB0FFD000490CC /* ocsp.h in Headers */,
 				DAFE4A63150399FF003ABA88 /* NSObject+PearlKVO.h in Headers */,
 				DAFE4A63150399FF003ABA94 /* NSDateFormatter+RFC3339.h in Headers */,
+				DAEB93F718AB0FFD000490CC /* idea.h in Headers */,
+				DAEB940F18AB0FFD000490CC /* safestack.h in Headers */,
+				DAEB941E18AB0FFD000490CC /* x509.h in Headers */,
+				DAEB93EF18AB0FFD000490CC /* ebcdic.h in Headers */,
+				DAEB93DE18AB0FFD000490CC /* blowfish.h in Headers */,
+				DAEB941718AB0FFD000490CC /* symhacks.h in Headers */,
 				93D39C34FE35830EF5BE1D2A /* NSArray+Indexing.h in Headers */,
+				DAEB942118AB0FFD000490CC /* crypto_aesctr.h in Headers */,
+				DAEB93F218AB0FFD000490CC /* ecdsa.h in Headers */,
+				DAEB942018AB0FFD000490CC /* x509v3.h in Headers */,
+				DAEB93E118AB0FFD000490CC /* camellia.h in Headers */,
+				DAEB93F618AB0FFD000490CC /* hmac.h in Headers */,
 				93D392EC39DA43C46C692C12 /* NSDictionary+Indexing.h in Headers */,
 				DA3509FE15F101A500C14A8E /* PearlQueue.h in Headers */,
-				DA5E5C8817248AA1003798D8 /* crypto_aesctr.h in Headers */,
+				DAEB942918AB0FFD000490CC /* warn.h in Headers */,
-				DA5E5C8917248AA1003798D8 /* crypto_scrypt.h in Headers */,
+				DAEB93DB18AB0FFD000490CC /* asn1_mac.h in Headers */,
-				DA5E5C8A17248AA1003798D8 /* memlimit.h in Headers */,
+				DAEB940518AB0FFD000490CC /* pem.h in Headers */,
-				DA5E5C8B17248AA1003798D8 /* readpass.h in Headers */,
+				DAEB942818AB0FFD000490CC /* sysendian.h in Headers */,
-				DA5E5C8C17248AA1003798D8 /* scryptenc.h in Headers */,
+				DAEB93FF18AB0FFD000490CC /* obj_mac.h in Headers */,
-				DA5E5C8D17248AA1003798D8 /* scryptenc_cpuperf.h in Headers */,
+				DAEB93E718AB0FFD000490CC /* crypto.h in Headers */,
-				DA5E5C8E17248AA1003798D8 /* sha256.h in Headers */,
+				DAEB941318AB0FFD000490CC /* ssl2.h in Headers */,
-				DA5E5C8F17248AA1003798D8 /* sysendian.h in Headers */,
+				DAEB940D18AB0FFD000490CC /* ripemd.h in Headers */,
-				DA5E5C9017248AA1003798D8 /* warn.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1265,6 +1579,8 @@
 				DA5E5D051724A667003798D8 /* MPPasswordWindowController.m in Sources */,
 				DA5E5D0C1724A667003798D8 /* main.m in Sources */,
 				DA5E5D0D1724A667003798D8 /* MasterPassword.xcdatamodeld in Sources */,
+				93D39C7C2BE7C0E0763B0177 /* MPElementCollectionView.m in Sources */,
+				93D39C5789EFA607CF788082 /* MPElementModel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1645,11 +1961,11 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer: Maarten Billemont (DWGU95U4ZD)";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "9AEC6040-D157-4526-8CA9-FF0254B3A4A5";
 				SKIP_INSTALL = NO;
 				WRAPPER_NAME = "Master Password.${WRAPPER_EXTENSION}";
 			};
@@ -1662,7 +1978,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
@@ -1760,11 +2076,11 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
-				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application: Maarten Billemont (HL3Q45LX9N)";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "170D83FD-18FE-4A05-B13C-8D16876480C6";
 				SKIP_INSTALL = NO;
 				WRAPPER_NAME = "Master Password.${WRAPPER_EXTENSION}";
 			};

MasterPassword/ObjC/Mac/en.lproj/MainMenu.xib

@@ -1,780 +1,187 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B3116" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
-	<data>
+    <dependencies>
-		<int key="IBDocument.SystemTarget">1070</int>
+        <deployment version="1070" defaultVersion="1080" identifier="macosx"/>
-		<string key="IBDocument.SystemVersion">12D78</string>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+    </dependencies>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
+    <objects>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+            <connections>
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                <outlet property="delegate" destination="494" id="495"/>
-			<string key="NS.object.0">3084</string>
+            </connections>
-		</object>
+        </customObject>
-		<array key="IBDocument.IntegratedClassDependencies">
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-			<string>NSCustomObject</string>
+        <customObject id="-3" userLabel="Application"/>
-			<string>NSMenu</string>
+        <menu title="AMainMenu" systemMenu="main" id="29"/>
-			<string>NSMenuItem</string>
+        <customObject id="494" customClass="MPMacAppDelegate">
-			<string>NSUserDefaultsController</string>
+            <connections>
-		</array>
+                <outlet property="createUserItem" destination="757" id="763"/>
-		<array key="IBDocument.PluginDependencies">
+                <outlet property="dialogStyleHUD" destination="768" id="771"/>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                <outlet property="dialogStyleRegular" destination="767" id="772"/>
-		</array>
+                <outlet property="lockItem" destination="720" id="726"/>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+                <outlet property="openAtLoginItem" destination="785" id="788"/>
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+                <outlet property="rememberPasswordItem" destination="744" id="750"/>
-			<integer value="1" key="NS.object.0"/>
+                <outlet property="savePasswordItem" destination="747" id="751"/>
-		</object>
+                <outlet property="showItem" destination="719" id="783"/>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+                <outlet property="statusMenu" destination="716" id="731"/>
-			<object class="NSCustomObject" id="1021">
+                <outlet property="useCloudItem" destination="743" id="749"/>
-				<string key="NSClassName">NSApplication</string>
+                <outlet property="usersItem" destination="755" id="762"/>
-			</object>
+            </connections>
-			<object class="NSCustomObject" id="1014">
+        </customObject>
-				<string key="NSClassName">FirstResponder</string>
+        <userDefaultsController representsSharedInstance="YES" id="548"/>
-			</object>
+        <menu autoenablesItems="NO" id="716">
-			<object class="NSCustomObject" id="1050">
+            <items>
-				<string key="NSClassName">NSApplication</string>
+                <menuItem title="Users" id="755">
-			</object>
+                    <modifierMask key="keyEquivalentModifierMask"/>
-			<object class="NSMenu" id="649796088">
+                    <menu key="submenu" title="Users" id="756">
-				<string key="NSTitle">AMainMenu</string>
+                        <items>
-				<array class="NSMutableArray" key="NSMenuItems"/>
+                            <menuItem title="New User" enabled="NO" toolTip="Creating users is not yet supported.  Please use the iOS app with iCloud enabled to create users and sites." id="757">
-				<string key="NSName">_NSMainMenu</string>
+                                <modifierMask key="keyEquivalentModifierMask"/>
-			</object>
+                                <connections>
-			<object class="NSCustomObject" id="976324537">
+                                    <action selector="newUser:" target="494" id="761"/>
-				<string key="NSClassName">MPMacAppDelegate</string>
+                                </connections>
-			</object>
+                            </menuItem>
-			<object class="NSUserDefaultsController" id="705910970">
+                            <menuItem isSeparatorItem="YES" id="759"/>
-				<bool key="NSSharedInstance">YES</bool>
+                        </items>
-			</object>
+                    </menu>
-			<object class="NSMenu" id="764588027">
+                </menuItem>
-				<string key="NSTitle"/>
+                <menuItem title="Preferences" id="739">
-				<array class="NSMutableArray" key="NSMenuItems">
+                    <modifierMask key="keyEquivalentModifierMask"/>
-					<object class="NSMenuItem" id="11982480">
+                    <menu key="submenu" title="Preferences" autoenablesItems="NO" id="742">
-						<reference key="NSMenu" ref="764588027"/>
+                        <items>
-						<string key="NSTitle">Users</string>
+                            <menuItem title="Use iCloud" id="743">
-						<string key="NSKeyEquiv"/>
+                                <modifierMask key="keyEquivalentModifierMask"/>
-						<int key="NSMnemonicLoc">2147483647</int>
+                                <connections>
-						<object class="NSCustomResource" key="NSOnImage" id="269450960">
+                                    <action selector="togglePreference:" target="494" id="752"/>
-							<string key="NSClassName">NSImage</string>
+                                </connections>
-							<string key="NSResourceName">NSMenuCheckmark</string>
+                            </menuItem>
-						</object>
+                            <menuItem title="Synchronize available sites from your iCloud account." enabled="NO" id="746">
-						<object class="NSCustomResource" key="NSMixedImage" id="977440657">
+                                <attributedString key="attributedTitle">
-							<string key="NSClassName">NSImage</string>
+                                    <fragment content="Synchronize available sites from your iCloud account.">
-							<string key="NSResourceName">NSMenuMixedState</string>
+                                        <attributes>
-						</object>
+                                            <font key="NSFont" size="12" name="Helvetica"/>
-						<string key="NSAction">submenuAction:</string>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
-						<object class="NSMenu" key="NSSubmenu" id="934187555">
+                                        </attributes>
-							<string key="NSTitle">Users</string>
+                                    </fragment>
-							<array class="NSMutableArray" key="NSMenuItems">
+                                </attributedString>
-								<object class="NSMenuItem" id="576787569">
+                                <modifierMask key="keyEquivalentModifierMask"/>
-									<reference key="NSMenu" ref="934187555"/>
+                            </menuItem>
-									<bool key="NSIsDisabled">YES</bool>
+                            <menuItem title="Open At Login" id="785">
-									<string key="NSTitle">New User</string>
+                                <modifierMask key="keyEquivalentModifierMask"/>
-									<string key="NSKeyEquiv"/>
+                                <connections>
-									<int key="NSMnemonicLoc">2147483647</int>
+                                    <action selector="togglePreference:" target="494" id="787"/>
-									<reference key="NSOnImage" ref="269450960"/>
+                                </connections>
-									<reference key="NSMixedImage" ref="977440657"/>
+                            </menuItem>
-								</object>
+                            <menuItem title="Always open Master Password at start-up." enabled="NO" id="786">
-								<object class="NSMenuItem" id="925131766">
+                                <attributedString key="attributedTitle">
-									<reference key="NSMenu" ref="934187555"/>
+                                    <fragment content="Always open Master Password at start-up.">
-									<bool key="NSIsDisabled">YES</bool>
+                                        <attributes>
-									<bool key="NSIsSeparator">YES</bool>
+                                            <font key="NSFont" size="12" name="Helvetica"/>
-									<string key="NSTitle"/>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
-									<string key="NSKeyEquiv"/>
+                                        </attributes>
-									<int key="NSMnemonicLoc">2147483647</int>
+                                    </fragment>
-									<reference key="NSOnImage" ref="269450960"/>
+                                </attributedString>
-									<reference key="NSMixedImage" ref="977440657"/>
+                                <modifierMask key="keyEquivalentModifierMask"/>
-								</object>
+                            </menuItem>
-							</array>
+                            <menuItem title="Remember Password" id="744">
-						</object>
+                                <modifierMask key="keyEquivalentModifierMask"/>
-					</object>
+                                <connections>
-					<object class="NSMenuItem" id="851296005">
+                                    <action selector="togglePreference:" target="494" id="753"/>
-						<reference key="NSMenu" ref="764588027"/>
+                                </connections>
-						<string key="NSTitle">Preferences</string>
+                            </menuItem>
-						<string key="NSKeyEquiv"/>
+                            <menuItem title="Remember the password while the application is running." enabled="NO" id="745">
-						<int key="NSMnemonicLoc">2147483647</int>
+                                <attributedString key="attributedTitle">
-						<reference key="NSOnImage" ref="269450960"/>
+                                    <fragment content="Remember the password while the application is running.">
-						<reference key="NSMixedImage" ref="977440657"/>
+                                        <attributes>
-						<string key="NSAction">submenuAction:</string>
+                                            <font key="NSFont" size="12" name="Helvetica"/>
-						<object class="NSMenu" key="NSSubmenu" id="800575174">
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
-							<string key="NSTitle">Preferences</string>
+                                        </attributes>
-							<array class="NSMutableArray" key="NSMenuItems">
+                                    </fragment>
-								<object class="NSMenuItem" id="14397049">
+                                </attributedString>
-									<reference key="NSMenu" ref="800575174"/>
+                                <modifierMask key="keyEquivalentModifierMask"/>
-									<string key="NSTitle">Use iCloud</string>
+                            </menuItem>
-									<string key="NSKeyEquiv"/>
+                            <menuItem title="Save Password" id="747">
-									<int key="NSMnemonicLoc">2147483647</int>
+                                <modifierMask key="keyEquivalentModifierMask"/>
-									<reference key="NSOnImage" ref="269450960"/>
+                                <connections>
-									<reference key="NSMixedImage" ref="977440657"/>
+                                    <action selector="togglePreference:" target="494" id="754"/>
-								</object>
+                                </connections>
-								<object class="NSMenuItem" id="461686112">
+                            </menuItem>
-									<reference key="NSMenu" ref="800575174"/>
+                            <menuItem title="Save the password in your keychain so you don't need to enter it again." enabled="NO" id="748">
-									<bool key="NSIsDisabled">YES</bool>
+                                <attributedString key="attributedTitle">
-									<string key="NSTitle">Synchronize available sites from your iCloud account.</string>
+                                    <fragment content="Save the password in your keychain so you don't need to enter it again.">
-									<string key="NSKeyEquiv"/>
+                                        <attributes>
-									<int key="NSMnemonicLoc">2147483647</int>
+                                            <font key="NSFont" size="12" name="Helvetica"/>
-									<reference key="NSOnImage" ref="269450960"/>
+                                            <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
-									<reference key="NSMixedImage" ref="977440657"/>
+                                        </attributes>
-									<object class="NSAttributedString" key="NSAttributedTitle">
+                                    </fragment>
-										<string key="NSString">Synchronize available sites from your iCloud account.</string>
+                                </attributedString>
-										<dictionary key="NSAttributes" id="583461090">
+                                <modifierMask key="keyEquivalentModifierMask"/>
-											<object class="NSFont" key="NSFont">
+                            </menuItem>
-												<string key="NSName">Helvetica</string>
+                            <menuItem title="Password Dialog Style" id="765">
-												<double key="NSSize">12</double>
+                                <modifierMask key="keyEquivalentModifierMask"/>
-												<int key="NSfFlags">16</int>
+                                <menu key="submenu" title="Password Dialog Style" id="766">
-											</object>
+                                    <items>
-											<object class="NSParagraphStyle" key="NSParagraphStyle">
+                                        <menuItem title="Regular" id="767">
-												<int key="NSAlignment">4</int>
+                                            <modifierMask key="keyEquivalentModifierMask"/>
-												<nil key="NSTabStops"/>
+                                            <connections>
-											</object>
+                                                <action selector="togglePreference:" target="494" id="773"/>
-										</dictionary>
+                                            </connections>
-									</object>
+                                        </menuItem>
-								</object>
+                                        <menuItem title="HUD" tag="1" id="768">
-								<object class="NSMenuItem" id="362714849">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
-									<reference key="NSMenu" ref="800575174"/>
+                                            <connections>
-									<string key="NSTitle">Open At Login</string>
+                                                <action selector="togglePreference:" target="494" id="774"/>
-									<string key="NSKeyEquiv"/>
+                                            </connections>
-									<int key="NSMnemonicLoc">2147483647</int>
+                                        </menuItem>
-									<reference key="NSOnImage" ref="269450960"/>
+                                    </items>
-									<reference key="NSMixedImage" ref="977440657"/>
+                                </menu>
-								</object>
+                            </menuItem>
-								<object class="NSMenuItem" id="409463580">
+                            <menuItem title="Advanced" id="776">
-									<reference key="NSMenu" ref="800575174"/>
+                                <modifierMask key="keyEquivalentModifierMask"/>
-									<bool key="NSIsDisabled">YES</bool>
+                                <menu key="submenu" title="Advanced" id="777">
-									<string key="NSTitle">Always open Master Password at start-up.</string>
+                                    <items>
-									<string key="NSKeyEquiv"/>
+                                        <menuItem title="iCloud Truth Sync" id="778">
-									<int key="NSMnemonicLoc">2147483647</int>
+                                            <modifierMask key="keyEquivalentModifierMask"/>
-									<reference key="NSOnImage" ref="269450960"/>
+                                            <connections>
-									<reference key="NSMixedImage" ref="977440657"/>
+                                                <action selector="rebuildCloud:" target="494" id="780"/>
-									<object class="NSAttributedString" key="NSAttributedTitle">
+                                            </connections>
-										<string key="NSString">Always open Master Password at start-up.</string>
+                                        </menuItem>
-										<reference key="NSAttributes" ref="583461090"/>
+                                        <menuItem title="Force this device's version of the truth upon all others." enabled="NO" id="779">
-									</object>
+                                            <attributedString key="attributedTitle">
-								</object>
+                                                <fragment content="Force this device's version of the truth upon all others.">
-								<object class="NSMenuItem" id="290760748">
+                                                    <attributes>
-									<reference key="NSMenu" ref="800575174"/>
+                                                        <font key="NSFont" size="12" name="Helvetica"/>
-									<string key="NSTitle">Remember Password</string>
+                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
-									<string key="NSKeyEquiv"/>
+                                                    </attributes>
-									<int key="NSMnemonicLoc">2147483647</int>
+                                                </fragment>
-									<reference key="NSOnImage" ref="269450960"/>
+                                            </attributedString>
-									<reference key="NSMixedImage" ref="977440657"/>
+                                            <modifierMask key="keyEquivalentModifierMask"/>
-								</object>
+                                        </menuItem>
-								<object class="NSMenuItem" id="907921953">
+                                    </items>
-									<reference key="NSMenu" ref="800575174"/>
+                                </menu>
-									<bool key="NSIsDisabled">YES</bool>
+                            </menuItem>
-									<string key="NSTitle">Remember the password while the application is running.</string>
+                        </items>
-									<string key="NSKeyEquiv"/>
+                    </menu>
-									<int key="NSMnemonicLoc">2147483647</int>
+                </menuItem>
-									<reference key="NSOnImage" ref="269450960"/>
+                <menuItem isSeparatorItem="YES" id="718"/>
-									<reference key="NSMixedImage" ref="977440657"/>
+                <menuItem title="Show" keyEquivalent="p" id="719">
-									<object class="NSAttributedString" key="NSAttributedTitle">
+                    <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
-										<string key="NSString">Remember the password while the application is running.</string>
+                    <connections>
-										<reference key="NSAttributes" ref="583461090"/>
+                        <action selector="showPasswordWindow:" target="494" id="782"/>
-									</object>
+                    </connections>
-								</object>
+                </menuItem>
-								<object class="NSMenuItem" id="110488020">
+                <menuItem title="Lock" enabled="NO" keyEquivalent="p" id="720">
-									<reference key="NSMenu" ref="800575174"/>
+                    <modifierMask key="keyEquivalentModifierMask" control="YES" option="YES" command="YES"/>
-									<string key="NSTitle">Save Password</string>
+                    <connections>
-									<string key="NSKeyEquiv"/>
+                        <action selector="lock:" target="494" id="764"/>
-									<int key="NSMnemonicLoc">2147483647</int>
+                    </connections>
-									<reference key="NSOnImage" ref="269450960"/>
+                </menuItem>
-									<reference key="NSMixedImage" ref="977440657"/>
+                <menuItem title="Quit" keyEquivalent="q" id="717">
-								</object>
+                    <connections>
-								<object class="NSMenuItem" id="123831322">
+                        <action selector="terminate:" target="494" id="784"/>
-									<reference key="NSMenu" ref="800575174"/>
+                    </connections>
-									<bool key="NSIsDisabled">YES</bool>
+                </menuItem>
-									<string key="NSTitle">Save the password in your keychain so you don't need to enter it again.</string>
+            </items>
-									<string key="NSKeyEquiv"/>
+        </menu>
-									<int key="NSMnemonicLoc">2147483647</int>
+    </objects>
-									<reference key="NSOnImage" ref="269450960"/>
+</document>
-									<reference key="NSMixedImage" ref="977440657"/>
-									<object class="NSAttributedString" key="NSAttributedTitle">
-										<string key="NSString">Save the password in your keychain so you don't need to enter it again.</string>
-										<reference key="NSAttributes" ref="583461090"/>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="123543264">
-									<reference key="NSMenu" ref="800575174"/>
-									<string key="NSTitle">Password Dialog Style</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="269450960"/>
-									<reference key="NSMixedImage" ref="977440657"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="293904698">
-										<string key="NSTitle">Password Dialog Style</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="560371092">
-												<reference key="NSMenu" ref="293904698"/>
-												<string key="NSTitle">Regular</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="269450960"/>
-												<reference key="NSMixedImage" ref="977440657"/>
-											</object>
-											<object class="NSMenuItem" id="117792016">
-												<reference key="NSMenu" ref="293904698"/>
-												<string key="NSTitle">HUD</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="269450960"/>
-												<reference key="NSMixedImage" ref="977440657"/>
-												<int key="NSTag">1</int>
-											</object>
-										</array>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="939693094">
-									<reference key="NSMenu" ref="800575174"/>
-									<string key="NSTitle">Advanced</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="269450960"/>
-									<reference key="NSMixedImage" ref="977440657"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="534220172">
-										<string key="NSTitle">Advanced</string>
-										<array class="NSMutableArray" key="NSMenuItems">
-											<object class="NSMenuItem" id="842321178">
-												<reference key="NSMenu" ref="534220172"/>
-												<string key="NSTitle">iCloud Truth Sync</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="269450960"/>
-												<reference key="NSMixedImage" ref="977440657"/>
-											</object>
-											<object class="NSMenuItem" id="946018575">
-												<reference key="NSMenu" ref="534220172"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<string key="NSTitle">Force this device's version of the truth upon all others.</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="269450960"/>
-												<reference key="NSMixedImage" ref="977440657"/>
-												<object class="NSAttributedString" key="NSAttributedTitle">
-													<string key="NSString">Force this device's version of the truth upon all others.</string>
-													<reference key="NSAttributes" ref="583461090"/>
-												</object>
-											</object>
-										</array>
-									</object>
-								</object>
-							</array>
-							<bool key="NSNoAutoenable">YES</bool>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="466252869">
-						<reference key="NSMenu" ref="764588027"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<bool key="NSIsSeparator">YES</bool>
-						<string key="NSTitle"/>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="269450960"/>
-						<reference key="NSMixedImage" ref="977440657"/>
-					</object>
-					<object class="NSMenuItem" id="846612332">
-						<reference key="NSMenu" ref="764588027"/>
-						<string key="NSTitle">Show</string>
-						<string key="NSKeyEquiv">p</string>
-						<int key="NSKeyEquivModMask">1310720</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="269450960"/>
-						<reference key="NSMixedImage" ref="977440657"/>
-					</object>
-					<object class="NSMenuItem" id="229948989">
-						<reference key="NSMenu" ref="764588027"/>
-						<bool key="NSIsDisabled">YES</bool>
-						<string key="NSTitle">Lock</string>
-						<string key="NSKeyEquiv">p</string>
-						<int key="NSKeyEquivModMask">1835008</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="269450960"/>
-						<reference key="NSMixedImage" ref="977440657"/>
-					</object>
-					<object class="NSMenuItem" id="291035877">
-						<reference key="NSMenu" ref="764588027"/>
-						<string key="NSTitle">Quit</string>
-						<string key="NSKeyEquiv">q</string>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="269450960"/>
-						<reference key="NSMixedImage" ref="977440657"/>
-					</object>
-				</array>
-				<bool key="NSNoAutoenable">YES</bool>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">495</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">lockItem</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="229948989"/>
-					</object>
-					<int key="connectionID">726</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">statusMenu</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="764588027"/>
-					</object>
-					<int key="connectionID">731</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">useCloudItem</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="14397049"/>
-					</object>
-					<int key="connectionID">749</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">rememberPasswordItem</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="290760748"/>
-					</object>
-					<int key="connectionID">750</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">savePasswordItem</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="110488020"/>
-					</object>
-					<int key="connectionID">751</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">togglePreference:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="14397049"/>
-					</object>
-					<int key="connectionID">752</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">togglePreference:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="290760748"/>
-					</object>
-					<int key="connectionID">753</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">togglePreference:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="110488020"/>
-					</object>
-					<int key="connectionID">754</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">newUser:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="576787569"/>
-					</object>
-					<int key="connectionID">761</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">usersItem</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="11982480"/>
-					</object>
-					<int key="connectionID">762</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">createUserItem</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="576787569"/>
-					</object>
-					<int key="connectionID">763</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">lock:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="229948989"/>
-					</object>
-					<int key="connectionID">764</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dialogStyleHUD</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="117792016"/>
-					</object>
-					<int key="connectionID">771</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dialogStyleRegular</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="560371092"/>
-					</object>
-					<int key="connectionID">772</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">togglePreference:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="560371092"/>
-					</object>
-					<int key="connectionID">773</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">togglePreference:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="117792016"/>
-					</object>
-					<int key="connectionID">774</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">rebuildCloud:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="842321178"/>
-					</object>
-					<int key="connectionID">780</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showPasswordWindow:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="846612332"/>
-					</object>
-					<int key="connectionID">782</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">showItem</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="846612332"/>
-					</object>
-					<int key="connectionID">783</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="291035877"/>
-					</object>
-					<int key="connectionID">784</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">togglePreference:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="362714849"/>
-					</object>
-					<int key="connectionID">787</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">openAtLoginItem</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="362714849"/>
-					</object>
-					<int key="connectionID">788</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<array class="NSMutableArray" key="children"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">548</int>
-						<reference key="object" ref="705910970"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">716</int>
-						<reference key="object" ref="764588027"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="291035877"/>
-							<reference ref="466252869"/>
-							<reference ref="229948989"/>
-							<reference ref="851296005"/>
-							<reference ref="846612332"/>
-							<reference ref="11982480"/>
-						</array>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">717</int>
-						<reference key="object" ref="291035877"/>
-						<reference key="parent" ref="764588027"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">718</int>
-						<reference key="object" ref="466252869"/>
-						<reference key="parent" ref="764588027"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">719</int>
-						<reference key="object" ref="846612332"/>
-						<reference key="parent" ref="764588027"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">720</int>
-						<reference key="object" ref="229948989"/>
-						<reference key="parent" ref="764588027"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">739</int>
-						<reference key="object" ref="851296005"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="800575174"/>
-						</array>
-						<reference key="parent" ref="764588027"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">742</int>
-						<reference key="object" ref="800575174"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="14397049"/>
-							<reference ref="290760748"/>
-							<reference ref="907921953"/>
-							<reference ref="461686112"/>
-							<reference ref="110488020"/>
-							<reference ref="123831322"/>
-							<reference ref="123543264"/>
-							<reference ref="939693094"/>
-							<reference ref="409463580"/>
-							<reference ref="362714849"/>
-						</array>
-						<reference key="parent" ref="851296005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">743</int>
-						<reference key="object" ref="14397049"/>
-						<reference key="parent" ref="800575174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">745</int>
-						<reference key="object" ref="907921953"/>
-						<reference key="parent" ref="800575174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">744</int>
-						<reference key="object" ref="290760748"/>
-						<reference key="parent" ref="800575174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">746</int>
-						<reference key="object" ref="461686112"/>
-						<reference key="parent" ref="800575174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">747</int>
-						<reference key="object" ref="110488020"/>
-						<reference key="parent" ref="800575174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">748</int>
-						<reference key="object" ref="123831322"/>
-						<reference key="parent" ref="800575174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">755</int>
-						<reference key="object" ref="11982480"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="934187555"/>
-						</array>
-						<reference key="parent" ref="764588027"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">756</int>
-						<reference key="object" ref="934187555"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="576787569"/>
-							<reference ref="925131766"/>
-						</array>
-						<reference key="parent" ref="11982480"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">757</int>
-						<reference key="object" ref="576787569"/>
-						<reference key="parent" ref="934187555"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">759</int>
-						<reference key="object" ref="925131766"/>
-						<reference key="parent" ref="934187555"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">765</int>
-						<reference key="object" ref="123543264"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="293904698"/>
-						</array>
-						<reference key="parent" ref="800575174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">766</int>
-						<reference key="object" ref="293904698"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="560371092"/>
-							<reference ref="117792016"/>
-						</array>
-						<reference key="parent" ref="123543264"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">767</int>
-						<reference key="object" ref="560371092"/>
-						<reference key="parent" ref="293904698"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">768</int>
-						<reference key="object" ref="117792016"/>
-						<reference key="parent" ref="293904698"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">776</int>
-						<reference key="object" ref="939693094"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="534220172"/>
-						</array>
-						<reference key="parent" ref="800575174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">777</int>
-						<reference key="object" ref="534220172"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="842321178"/>
-							<reference ref="946018575"/>
-						</array>
-						<reference key="parent" ref="939693094"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">778</int>
-						<reference key="object" ref="842321178"/>
-						<reference key="parent" ref="534220172"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">779</int>
-						<reference key="object" ref="946018575"/>
-						<reference key="parent" ref="534220172"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">785</int>
-						<reference key="object" ref="362714849"/>
-						<reference key="parent" ref="800575174"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">786</int>
-						<reference key="object" ref="409463580"/>
-						<reference key="parent" ref="800575174"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="494.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="548.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="716.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="717.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="718.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="719.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="720.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="739.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="742.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="743.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="744.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="745.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="746.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="747.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="748.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="755.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="756.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<object class="NSMutableDictionary" key="757.IBAttributePlaceholdersKey">
-					<string key="NS.key.0">ToolTip</string>
-					<object class="IBToolTipAttribute" key="NS.object.0">
-						<string key="name">ToolTip</string>
-						<reference key="object" ref="576787569"/>
-						<string key="toolTip">Creating users is not yet supported.  Please use the iOS app with iCloud enabled to create users and sites.</string>
-					</object>
-				</object>
-				<string key="757.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="759.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="765.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="766.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="767.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="768.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="776.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="777.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="778.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="779.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="785.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="786.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">788</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1070" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSMenuCheckmark">{11, 11}</string>
-			<string key="NSMenuMixedState">{10, 3}</string>
-		</dictionary>
-		<bool key="IBDocument.UseAutolayout">YES</bool>
-	</data>
-</archive>