Crashlytics for Mac update.

Mac build fixes and Fabric integration.
Add TouchID to storeVersions and update crypto libs for bitcode.
2016-01-27 21:40:09 -05:00 · 2016-01-27 21:38:36 -05:00 · 2016-01-15 00:19:07 -05:00 · 2016-01-14 11:24:27 -05:00 · 2016-01-14 11:22:15 -05:00 · 2016-01-14 10:50:03 -05:00
50 changed files with 791 additions and 698 deletions
--- a/External/Mac/Crashlytics.framework/Versions/A/Crashlytics
+++ b/External/Mac/Crashlytics.framework/Versions/A/Crashlytics
--- a/External/Mac/Crashlytics.framework/Versions/A/Headers/Answers.h
+++ b/External/Mac/Crashlytics.framework/Versions/A/Headers/Answers.h
@@ -10,6 +10,10 @@

 NS_ASSUME_NONNULL_BEGIN

+/**
+ *  This class exposes the Answers Events API, allowing you to track key 
+ *  user user actions and metrics in your app.
+ */
@interface Answers : NSObject

 /**
@@ -18,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 *
 *  @param signUpMethodOrNil     The method by which a user logged in, e.g. Twitter or Digits.
 *  @param signUpSucceededOrNil  The ultimate success or failure of the login
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this purchase.
+ *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
 */
 + (void)logSignUpWithMethod:(nullable NSString *)signUpMethodOrNil
                    success:(nullable NSNumber *)signUpSucceededOrNil
@@ -30,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 *
 *  @param loginMethodOrNil      The method by which a user logged in, e.g. email, Twitter or Digits.
 *  @param loginSucceededOrNil   The ultimate success or failure of the login
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this purchase.
+ *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
 */
 + (void)logLoginWithMethod:(nullable NSString *)loginMethodOrNil
                   success:(nullable NSNumber *)loginSucceededOrNil
@@ -57,7 +61,7 @@ NS_ASSUME_NONNULL_BEGIN
 *  your application.
 *
 *  @param inviteMethodOrNil     The method of invitation, e.g. GameCenter, Twitter, email.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this purchase.
+ *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
 */
 + (void)logInviteWithMethod:(nullable NSString *)inviteMethodOrNil
           customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
@@ -70,8 +74,8 @@ NS_ASSUME_NONNULL_BEGIN
 *  @param currencyOrNil          The ISO4217 currency code. Example: USD
 *  @param purchaseSucceededOrNil Was the purchase succesful or unsuccesful
 *  @param itemNameOrNil          The human-readable form of the item's name. Example:
- *  @param itemIdOrNil            The machine-readable, unique item identifier Example: SKU
 *  @param itemTypeOrNil          The type, or genre of the item. Example: Song
+ *  @param itemIdOrNil            The machine-readable, unique item identifier Example: SKU
 *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this purchase.
 */
 + (void)logPurchaseWithPrice:(nullable NSDecimalNumber *)itemPriceOrNil
@@ -97,7 +101,7 @@ NS_ASSUME_NONNULL_BEGIN
 *  @param levelNameOrNil                 The name of the level completed, E.G. "1" or "Training"
 *  @param scoreOrNil                     The score the user completed the level with.
 *  @param levelCompletedSuccesfullyOrNil A boolean representing whether or not the level was completed succesfully.
- *  @param customAttributesOrNil          A dictionary of custom attributes to associate with this purchase.
+ *  @param customAttributesOrNil          A dictionary of custom attributes to associate with this event.
 */
 + (void)logLevelEnd:(nullable NSString *)levelNameOrNil
              score:(nullable NSNumber *)scoreOrNil
@@ -114,7 +118,7 @@ NS_ASSUME_NONNULL_BEGIN
 *  @param itemNameOrNil          The human-readable form of the item's name. Example:
 *  @param itemTypeOrNil          The type, or genre of the item. Example: Song
 *  @param itemIdOrNil            The machine-readable, unique item identifier Example: SKU
- *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this purchase.
+ *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this event.
 */
 + (void)logAddToCartWithPrice:(nullable NSDecimalNumber *)itemPriceOrNil
                     currency:(nullable NSString *)currencyOrNil
@@ -131,7 +135,7 @@ NS_ASSUME_NONNULL_BEGIN
 *  @param totalPriceOrNil        The total price of the cart.
 *  @param currencyOrNil          The ISO4217 currency code. Example: USD
 *  @param itemCountOrNil         The number of items in the cart.
- *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this purchase.
+ *  @param customAttributesOrNil  A dictionary of custom attributes to associate with this event.
 */
 + (void)logStartCheckoutWithPrice:(nullable NSDecimalNumber *)totalPriceOrNil
                         currency:(nullable NSString *)currencyOrNil
@@ -184,7 +188,7 @@ NS_ASSUME_NONNULL_BEGIN
 *  the name of the event, since this is how the event will appear in Answers.
 *
 *  @param eventName             The human-readable name for the event.
- *  @param customAttributesOrNil A dictionary of custom attributes to associate with this purchase. Attribute keys
+ *  @param customAttributesOrNil A dictionary of custom attributes to associate with this event. Attribute keys
 *                               must be <code>NSString</code> and and values must be <code>NSNumber</code> or <code>NSString</code>.
 *  @discussion                  How we treat <code>NSNumbers</code>:
 *                               We will provide information about the distribution of values over time.
--- a/External/Mac/Crashlytics.framework/Versions/A/Headers/Crashlytics.h
+++ b/External/Mac/Crashlytics.framework/Versions/A/Headers/Crashlytics.h
@@ -181,6 +181,21 @@ NS_ASSUME_NONNULL_BEGIN
 */
 - (void)recordCustomExceptionName:(NSString *)name reason:(nullable NSString *)reason frameArray:(CLS_GENERIC_NSARRAY(CLSStackFrame *) *)frameArray;

+/**
+ *
+ * This allows you to record a non-fatal event, described by an NSError object. These events will be grouped and
+ * displayed similarly to crashes. Keep in mind that this method can be expensive. Also, the total number of
+ * NSErrors that can be recorded during your app's life-cycle is limited by a fixed-size circular buffer. If the
+ * buffer is overrun, the oldest data is dropped. Errors are relayed to Crashlytics on a subsequent launch
+ * of your application.
+ *
+ * You can also use the -recordError:withAdditionalUserInfo: to include additional context not represented
+ * by the NSError instance itself.
+ *
+ **/
+- (void)recordError:(NSError *)error;
+- (void)recordError:(NSError *)error withAdditionalUserInfo:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)userInfo;
+
 - (void)logEvent:(NSString *)eventName CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
 - (void)logEvent:(NSString *)eventName attributes:(nullable NSDictionary *) attributes CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
 + (void)logEvent:(NSString *)eventName CLS_DEPRECATED("Please refer to Answers +logCustomEventWithName:");
--- a/External/Mac/Crashlytics.framework/Versions/A/Resources/Info.plist
+++ b/External/Mac/Crashlytics.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14E46</string>
+	<string>14F1021</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -17,25 +17,29 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.4</string>
+	<string>3.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
 	<key>CFBundleVersion</key>
-	<string>82</string>
+	<string>99</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>6E35b</string>
+	<string>7B91b</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>14D125</string>
+	<string>15A278</string>
 	<key>DTSDKName</key>
-	<string>macosx10.10</string>
+	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0640</string>
+	<string>0710</string>
 	<key>DTXcodeBuild</key>
-	<string>6E35b</string>
+	<string>7B91b</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Crashlytics, Inc. All rights reserved.</string>
 	<key>UIDeviceFamily</key>
--- a/External/Mac/Crashlytics.framework/run
+++ b/External/Mac/Crashlytics.framework/run
@@ -11,8 +11,8 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 DIR="\"${DIR}"

 PATH_SEP="/"
-VALIDATE_COMMAND="uploadDSYM\" $@ validate"
-UPLOAD_COMMAND="uploadDSYM\" $@"
+VALIDATE_COMMAND="uploadDSYM\" $@ validate run-script"
+UPLOAD_COMMAND="uploadDSYM\" $@ run-script"

 #  Ensure params are as expected, run in sync mode to validate
 eval $DIR$PATH_SEP$VALIDATE_COMMAND
--- a/External/Mac/Crashlytics.framework/submit
+++ b/External/Mac/Crashlytics.framework/submit
--- a/External/Mac/Crashlytics.framework/uploadDSYM
+++ b/External/Mac/Crashlytics.framework/uploadDSYM
--- a/External/Mac/Fabric.framework/Versions/A/Fabric
+++ b/External/Mac/Fabric.framework/Versions/A/Fabric
--- a/External/Mac/Fabric.framework/Versions/A/Headers/FABAttributes.h
+++ b/External/Mac/Fabric.framework/Versions/A/Headers/FABAttributes.h
@@ -2,7 +2,19 @@
 //  FABAttributes.h
 //  Fabric
 //
-//  Copyright (c) 2015 Twitter. All rights reserved.
+//  Copyright (C) 2015 Twitter, Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //

 #pragma once
--- a/External/Mac/Fabric.framework/Versions/A/Headers/Fabric.h
+++ b/External/Mac/Fabric.framework/Versions/A/Headers/Fabric.h
@@ -1,7 +1,20 @@
 //
 //  Fabric.h
+//  Fabric
 //
-//  Copyright (c) 2015 Twitter. All rights reserved.
+//  Copyright (C) 2015 Twitter, Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 //

 #import <Foundation/Foundation.h>
--- a/External/Mac/Fabric.framework/Versions/A/Resources/Info.plist
+++ b/External/Mac/Fabric.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>14E46</string>
+	<string>14F1021</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.5</string>
+	<string>1.6.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,11 +25,11 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>30</string>
+	<string>45</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>7A220</string>
+	<string>7B91b</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
@@ -37,9 +37,9 @@
 	<key>DTSDKName</key>
 	<string>macosx10.11</string>
 	<key>DTXcode</key>
-	<string>0700</string>
+	<string>0710</string>
 	<key>DTXcodeBuild</key>
-	<string>7A220</string>
+	<string>7B91b</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2015 Twitter. All rights reserved.</string>
 	<key>UIDeviceFamily</key>
--- a/External/Mac/Fabric.framework/run
+++ b/External/Mac/Fabric.framework/run
@@ -11,8 +11,8 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 DIR="\"${DIR}"

 PATH_SEP="/"
-VALIDATE_COMMAND="uploadDSYM\" $@ validate"
-UPLOAD_COMMAND="uploadDSYM\" $@"
+VALIDATE_COMMAND="uploadDSYM\" $@ validate run-script"
+UPLOAD_COMMAND="uploadDSYM\" $@ run-script"

 #  Ensure params are as expected, run in sync mode to validate
 eval $DIR$PATH_SEP$VALIDATE_COMMAND
--- a/External/Mac/Fabric.framework/uploadDSYM
+++ b/External/Mac/Fabric.framework/uploadDSYM
--- a/External/Pearl
+++ b/External/Pearl
--- a/MasterPassword/C/build
+++ b/MasterPassword/C/build
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 #
 # TROUBLESHOOTING
-#   - To enable verbose algorithm/implementation debugging, use ./build -DDEBUG
 #   - If you see 'undefined reference to `AES_encrypt'',
 #       make sure you have openssl installed.
 #       If libcrypto.a is in a non-standard directory, try ./build -L[your-lib-dir]
--- a/MasterPassword/C/mpw-bench.c
+++ b/MasterPassword/C/mpw-bench.c
@@ -16,6 +16,7 @@
 #include <bcrypt/ow-crypt.h>

 #include "mpw-algorithm.h"
+#include "mpw-util.h"

 #define MP_N                32768
 #define MP_r                8
--- a/MasterPassword/C/mpw-cli.c
+++ b/MasterPassword/C/mpw-cli.c
@@ -13,8 +13,6 @@
 #include <histedit.h>
 #endif

-#define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); exit(2); } while (0)
-
 #include "mpw-algorithm.h"
 #include "mpw-util.h"

@@ -25,9 +23,9 @@

 static void usage() {

-    fprintf( stderr, "Usage: mpw [-u name] [-t type] [-c counter] [-V version] [-v variant] [-C context] [-h] site\n\n" );
+    fprintf( stderr, "Usage: mpw [-u name] [-t type] [-c counter] [-a algorithm] [-V variant] [-C context] [-v|-q] [-h] site\n\n" );
    fprintf( stderr, "    -u name      Specify the full name of the user.\n"
-            "                 Defaults to %s in env.\n\n", MP_env_fullname );
+            "                 Defaults to %s in env or prompts.\n\n", MP_env_fullname );
    fprintf( stderr, "    -t type      Specify the password's template.\n"
            "                 Defaults to %s in env or 'long' for password, 'name' for login.\n"
            "                     x, max, maximum | 20 characters, contains symbols.\n"
@@ -40,23 +38,27 @@ static void usage() {
            "                     p, phrase       | 20 character sentence.\n\n", MP_env_sitetype );
    fprintf( stderr, "    -c counter   The value of the counter.\n"
            "                 Defaults to %s in env or 1.\n\n", MP_env_sitecounter );
-    fprintf( stderr, "    -V version   The algorithm version to use.\n"
+    fprintf( stderr, "    -a version   The algorithm version to use.\n"
            "                 Defaults to %s in env or %d.\n\n", MP_env_algorithm, MPAlgorithmVersionCurrent );
-    fprintf( stderr, "    -v variant   The kind of content to generate.\n"
+    fprintf( stderr, "    -V variant   The kind of content to generate.\n"
            "                 Defaults to 'password'.\n"
            "                     p, password | The password to log in with.\n"
            "                     l, login    | The username to log in as.\n"
            "                     a, answer   | The answer to a security question.\n\n" );
    fprintf( stderr, "    -C context   A variant-specific context.\n"
            "                 Defaults to empty.\n"
-            "                  -v p, password | Doesn't currently use a context.\n"
-            "                  -v l, login    | Doesn't currently use a context.\n"
-            "                  -v a, answer   | Empty for a universal site answer or\n"
+            "                  -V p, password | Doesn't currently use a context.\n"
+            "                  -V l, login    | Doesn't currently use a context.\n"
+            "                  -V a, answer   | Empty for a universal site answer or\n"
            "                                 | the most significant word(s) of the question.\n\n" );
+    fprintf( stderr, "    -v           Increase output verbosity (can be repeated).\n\n" );
+    fprintf( stderr, "    -q           Decrease output verbosity (can be repeated).\n\n" );
    fprintf( stderr, "    ENVIRONMENT\n\n"
-            "        MP_FULLNAME    | The full name of the user.\n"
-            "        MP_SITETYPE    | The default password template.\n"
-            "        MP_SITECOUNTER | The default counter value.\n\n" );
+            "        %-14s | The full name of the user (see -u).\n"
+            "        %-14s | The default password template (see -t).\n"
+            "        %-14s | The default counter value (see -c).\n"
+            "        %-14s | The default algorithm version (see -a).\n\n",
+            MP_env_fullname, MP_env_sitetype, MP_env_sitecounter, MP_env_algorithm );
    exit( 0 );
 }

@@ -111,7 +113,7 @@ int main(int argc, char *const argv[]) {
            ftl( "Invalid %s: %s\n", MP_env_algorithm, algorithmVersionString );

    // Read the options.
-    for (int opt; (opt = getopt( argc, argv, "u:P:t:c:v:V:C:h" )) != -1;)
+    for (int opt; (opt = getopt( argc, argv, "u:P:t:c:V:a:C:vqh" )) != -1;)
        switch (opt) {
            case 'u':
                fullName = optarg;
@@ -127,16 +129,22 @@ int main(int argc, char *const argv[]) {
            case 'c':
                siteCounterString = optarg;
                break;
-            case 'v':
+            case 'V':
                siteVariantString = optarg;
                break;
-            case 'V':
+            case 'a':
                if (sscanf( optarg, "%u", &algorithmVersion ) != 1)
                    ftl( "Not a version: %s\n", optarg );
                break;
            case 'C':
                siteContextString = optarg;
                break;
+            case 'v':
+                ++mpw_verbosity;
+                break;
+            case 'q':
+                --mpw_verbosity;
+                break;
            case 'h':
                usage();
                break;
--- a/MasterPassword/C/mpw-util.h
+++ b/MasterPassword/C/mpw-util.h
@@ -6,21 +6,50 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //

+#include <stdio.h>
 #include <stdint.h>

 //// Logging.

-#ifdef DEBUG
-    #ifndef trc
-        #define trc(...) fprintf( stderr, __VA_ARGS__ )
-    #endif
-#else
-    #ifndef trc
-        #define trc(...) do {} while (0)
-    #endif
+#ifndef trc
+int mpw_verbosity;
+    #define trc_level 3
+    #define trc(...) \
+        if (mpw_verbosity >= 3) \
+            fprintf( stderr, __VA_ARGS__ )
+#endif
+#ifndef dbg
+    #define dbg_level 2
+    #define dbg(...) \
+        if (mpw_verbosity >= 2) \
+            fprintf( stderr, __VA_ARGS__ )
+#endif
+#ifndef inf
+    #define inf_level 1
+    #define inf(...) \
+        if (mpw_verbosity >= 1) \
+            fprintf( stderr, __VA_ARGS__ )
+#endif
+#ifndef wrn
+    #define wrn_level 0
+    #define wrn(...) \
+        if (mpw_verbosity >= 0) \
+            fprintf( stderr, __VA_ARGS__ )
+#endif
+#ifndef err
+    #define err_level -1
+    #define err(...) \
+        if (mpw_verbosity >= -1) \
+            fprintf( stderr, __VA_ARGS__ )
 #endif
 #ifndef ftl
-    #define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); abort(); } while (0)
+    #define ftl_level -2
+    #define ftl(...) \
+        do { \
+            if (mpw_verbosity >= -2) \
+                fprintf( stderr, __VA_ARGS__ ); \
+            exit( 2 ); \
+        } while (0)
 #endif

 //// Buffers and memory.
--- a/MasterPassword/Java/masterpassword-algorithm/pom.xml
+++ b/MasterPassword/Java/masterpassword-algorithm/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.lyndir.masterpassword</groupId>
        <artifactId>masterpassword</artifactId>
-        <version>2.3.1</version>
+        <version>GIT-SNAPSHOT</version>
    </parent>

    <name>Master Password Algorithm Implementation</name>
--- a/MasterPassword/Java/masterpassword-android/pom.xml
+++ b/MasterPassword/Java/masterpassword-android/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.lyndir.masterpassword</groupId>
        <artifactId>masterpassword</artifactId>
-        <version>2.3.1</version>
+        <version>GIT-SNAPSHOT</version>
    </parent>

    <name>Master Password Android</name>
@@ -104,13 +104,13 @@
        <dependency>
            <groupId>com.lyndir.masterpassword</groupId>
            <artifactId>masterpassword-algorithm</artifactId>
-            <version>2.3.1</version>
+            <version>GIT-SNAPSHOT</version>
        </dependency>

        <dependency>
            <groupId>com.lyndir.masterpassword</groupId>
            <artifactId>masterpassword-tests</artifactId>
-            <version>2.3.1</version>
+            <version>GIT-SNAPSHOT</version>
        </dependency>

        <!-- EXTERNAL DEPENDENCIES -->
--- a/MasterPassword/Java/masterpassword-cli/pom.xml
+++ b/MasterPassword/Java/masterpassword-cli/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.lyndir.masterpassword</groupId>
        <artifactId>masterpassword</artifactId>
-        <version>2.3.1</version>
+        <version>GIT-SNAPSHOT</version>
    </parent>

    <name>Master Password CLI</name>
@@ -85,7 +85,7 @@
        <dependency>
            <groupId>com.lyndir.masterpassword</groupId>
            <artifactId>masterpassword-algorithm</artifactId>
-            <version>2.3.1</version>
+            <version>GIT-SNAPSHOT</version>
        </dependency>

        <dependency>
--- a/MasterPassword/Java/masterpassword-gui/pom.xml
+++ b/MasterPassword/Java/masterpassword-gui/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.lyndir.masterpassword</groupId>
        <artifactId>masterpassword</artifactId>
-        <version>2.3.1</version>
+        <version>GIT-SNAPSHOT</version>
    </parent>

    <name>Master Password GUI</name>
@@ -134,7 +134,7 @@
        <dependency>
            <groupId>com.lyndir.masterpassword</groupId>
            <artifactId>masterpassword-model</artifactId>
-            <version>2.3.1</version>
+            <version>GIT-SNAPSHOT</version>
        </dependency>

        <!-- EXTERNAL DEPENDENCIES -->
--- a/MasterPassword/Java/masterpassword-model/pom.xml
+++ b/MasterPassword/Java/masterpassword-model/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.lyndir.masterpassword</groupId>
        <artifactId>masterpassword</artifactId>
-        <version>2.3.1</version>
+        <version>GIT-SNAPSHOT</version>
    </parent>

    <name>Master Password Site Model</name>
@@ -23,7 +23,7 @@
        <dependency>
            <groupId>com.lyndir.masterpassword</groupId>
            <artifactId>masterpassword-algorithm</artifactId>
-            <version>2.3.1</version>
+            <version>GIT-SNAPSHOT</version>
        </dependency>

        <!-- EXTERNAL DEPENDENCIES -->
--- a/MasterPassword/Java/masterpassword-tests/pom.xml
+++ b/MasterPassword/Java/masterpassword-tests/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <groupId>com.lyndir.masterpassword</groupId>
        <artifactId>masterpassword</artifactId>
-        <version>2.3.1</version>
+        <version>GIT-SNAPSHOT</version>
    </parent>

    <name>Master Password Test Suite</name>
@@ -23,7 +23,7 @@
        <dependency>
            <groupId>com.lyndir.masterpassword</groupId>
            <artifactId>masterpassword-algorithm</artifactId>
-            <version>2.3.1</version>
+            <version>GIT-SNAPSHOT</version>
        </dependency>

        <!-- TESTING -->
--- a/MasterPassword/Java/pom.xml
+++ b/MasterPassword/Java/pom.xml
@@ -15,7 +15,7 @@

    <groupId>com.lyndir.masterpassword</groupId>
    <artifactId>masterpassword</artifactId>
-    <version>2.3.1</version>
+    <version>GIT-SNAPSHOT</version>
    <packaging>pom</packaging>

    <modules>
@@ -58,8 +58,4 @@
            </releases>
        </repository>
    </repositories>
-
-  <scm>
-    <tag>2.3.1</tag>
-  </scm>
 </project>
--- a/MasterPassword/ObjC/MPAppDelegate_InApp.m
+++ b/MasterPassword/ObjC/MPAppDelegate_InApp.m
@@ -36,7 +36,7 @@ PearlAssociatedObjectProperty( NSMutableArray*, ProductObservers, productObserve
 - (void)reloadProducts {

    SKProductsRequest *productsRequest = [[SKProductsRequest alloc] initWithProductIdentifiers:
-            [[NSSet alloc] initWithObjects:MPProductGenerateLogins, MPProductGenerateAnswers, MPProductFuel, nil]];
+            [[NSSet alloc] initWithObjects:MPProductGenerateLogins, MPProductGenerateAnswers, MPProductTouchID, MPProductFuel, nil]];
    productsRequest.delegate = self;
    [productsRequest start];
 }
--- a/MasterPassword/ObjC/MPAppDelegate_Key.m
+++ b/MasterPassword/ObjC/MPAppDelegate_Key.m
@@ -8,6 +8,7 @@

 #import "MPAppDelegate_Key.h"
 #import "MPAppDelegate_Store.h"
+#import <LocalAuthentication/LocalAuthentication.h>

@interface MPAppDelegate_Shared()

@@ -17,50 +18,76 @@

@implementation MPAppDelegate_Shared(Key)

-static NSDictionary *keyQuery(MPUserEntity *user) {
+static NSDictionary *createKeyQuery(MPUserEntity *user, BOOL newItem, MPKeyOrigin *keyOrigin) {
+
+#if TARGET_OS_IPHONE
+    if (user.touchID && kSecUseOperationPrompt) {
+        if (keyOrigin)
+            *keyOrigin = MPKeyOriginKeyChainBiometric;
+
+        CFErrorRef acError = NULL;
+        SecAccessControlRef accessControl = SecAccessControlCreateWithFlags( kCFAllocatorDefault,
+                kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly, kSecAccessControlTouchIDCurrentSet, &acError );
+        if (!accessControl || acError)
+            err( @"Could not use TouchID on this device: %@", acError );
+
+        else
+            return [PearlKeyChain createQueryForClass:kSecClassGenericPassword
+                                           attributes:@{
+                                                   (__bridge id)kSecAttrService         : @"Saved Master Password",
+                                                   (__bridge id)kSecAttrAccount         : user.name?: @"",
+                                                   (__bridge id)kSecAttrAccessControl   : (__bridge id)accessControl,
+                                                   (__bridge id)kSecUseAuthenticationUI : (__bridge id)kSecUseAuthenticationUIAllow,
+                                                   (__bridge id)kSecUseOperationPrompt  :
+                                                   strf( @"Access %@'s master password.", user.name ),
+                                           }
+                                              matches:nil];
+    }
+#endif
+
+    if (keyOrigin)
+        *keyOrigin = MPKeyOriginKeyChain;

    return [PearlKeyChain createQueryForClass:kSecClassGenericPassword
                                   attributes:@{
-                                           (__bridge id)kSecAttrService : @"Saved Master Password",
-                                           (__bridge id)kSecAttrAccount : user.name?: @""
+                                           (__bridge id)kSecAttrService    : @"Saved Master Password",
+                                           (__bridge id)kSecAttrAccount    : user.name?: @"",
+#if TARGET_OS_IPHONE
+                                           (__bridge id)kSecAttrAccessible : (__bridge id)(kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly?: kSecAttrAccessibleWhenUnlockedThisDeviceOnly),
+#endif
                                   }
                                      matches:nil];
 }

 - (MPKey *)loadSavedKeyFor:(MPUserEntity *)user {

-    NSData *keyData = [PearlKeyChain dataOfItemForQuery:keyQuery( user )];
+    MPKeyOrigin keyOrigin;
+    NSDictionary *keyQuery = createKeyQuery( user, NO, &keyOrigin );
+    NSData *keyData = [PearlKeyChain dataOfItemForQuery:keyQuery];
    if (!keyData) {
        inf( @"No key found in keychain for user: %@", user.userID );
        return nil;
    }

    inf( @"Found key in keychain for user: %@", user.userID );
-    return [[MPKey alloc] initForFullName:user.name withKeyData:keyData forAlgorithm:user.algorithm];
+    return [[MPKey alloc] initForFullName:user.name withKeyData:keyData forAlgorithm:user.algorithm keyOrigin:keyOrigin];
 }

 - (void)storeSavedKeyFor:(MPUserEntity *)user {

    if (user.saveKey) {
-        NSData *existingKeyData = [PearlKeyChain dataOfItemForQuery:keyQuery( user )];
+        inf( @"Saving key in keychain for user: %@", user.userID );

-        if (![existingKeyData isEqualToData:[self.key keyDataForAlgorithm:user.algorithm]]) {
-            inf( @"Saving key in keychain for user: %@", user.userID );
-
-            [PearlKeyChain addOrUpdateItemForQuery:keyQuery( user )
-                                    withAttributes:@{
-                                            (__bridge id)kSecValueData      : [self.key keyDataForAlgorithm:user.algorithm],
-#if TARGET_OS_IPHONE
-                                            (__bridge id)kSecAttrAccessible : (__bridge id)kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
-#endif
-                                    }];
-        }
+        [PearlKeyChain addOrUpdateItemForQuery:createKeyQuery( user, YES, nil )
+                                withAttributes:@{
+                                        (__bridge id)kSecValueData : [self.key keyDataForAlgorithm:user.algorithm],
+                                }];
    }
 }

 - (void)forgetSavedKeyFor:(MPUserEntity *)user {

-    OSStatus result = [PearlKeyChain deleteItemForQuery:keyQuery( user )];
+    OSStatus result = [PearlKeyChain deleteItemForQuery:createKeyQuery( user, NO, nil )];
    if (result == noErr) {
        inf( @"Removed key from keychain for user: %@", user.userID );

@@ -79,8 +106,7 @@ static NSDictionary *keyQuery(MPUserEntity *user) {

 - (BOOL)signInAsUser:(MPUserEntity *)user saveInContext:(NSManagedObjectContext *)moc usingMasterPassword:(NSString *)password {

-    if (password)
-        NSAssert( ![NSThread isMainThread], @"Computing key must not happen from the main thread." );
+    NSAssert( ![NSThread isMainThread], @"Authentication should not happen on the main thread." );
    if (!user)
        return NO;

@@ -144,7 +170,17 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
        }

        self.key = tryKey;
-        [self storeSavedKeyFor:user];
+
+        // Update the key chain if necessary.
+        switch (self.key.origin) {
+            case MPKeyOriginMasterPassword:
+                [self storeSavedKeyFor:user];
+                break;
+
+            case MPKeyOriginKeyChain:
+            case MPKeyOriginKeyChainBiometric:
+                break;
+        }
    }

    @try {
@@ -201,17 +237,17 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
                                                       site.name )
                                     viewStyle:UIAlertViewStyleSecureTextInput
                                     initAlert:nil tappedButtonBlock:^(UIAlertView *alert_, NSInteger buttonIndex_) {
-                    @try {
-                        if (buttonIndex_ == [alert_ cancelButtonIndex])
-                            // Don't Migrate
-                            return;
+                            @try {
+                                if (buttonIndex_ == [alert_ cancelButtonIndex])
+                                    // Don't Migrate
+                                    return;

-                        masterPassword = [alert_ textFieldAtIndex:0].text;
-                    }
-                    @finally {
-                        dispatch_group_leave( recoverPasswordGroup );
-                    }
-                }                  cancelTitle:@"Don't Migrate" otherTitles:@"Migrate", nil];
+                                masterPassword = [alert_ textFieldAtIndex:0].text;
+                            }
+                            @finally {
+                                dispatch_group_leave( recoverPasswordGroup );
+                            }
+                        }          cancelTitle:@"Don't Migrate" otherTitles:@"Migrate", nil];
                dispatch_group_wait( recoverPasswordGroup, DISPATCH_TIME_FOREVER );
 #endif
                if (!masterPassword)
--- a/MasterPassword/ObjC/MPEntities.h
+++ b/MasterPassword/ObjC/MPEntities.h
@@ -53,6 +53,7 @@

@property(assign) NSUInteger avatar;
@property(assign) BOOL saveKey;
+@property(assign) BOOL touchID;
@property(assign) MPSiteType defaultType;
@property(readonly) NSString *userID;
@property(strong) id<MPAlgorithm> algorithm;
--- a/MasterPassword/ObjC/MPEntities.m
+++ b/MasterPassword/ObjC/MPEntities.m
@@ -9,6 +9,7 @@
 #import "MPEntities.h"
 #import "MPAppDelegate_Shared.h"
 #import "MPAppDelegate_Key.h"
+#import "MPAppDelegate_InApp.h"

@implementation NSManagedObjectContext(MP)

@@ -285,6 +286,16 @@
    self.saveKey_ = @(aSaveKey);
 }

+- (BOOL)touchID {
+
+    return [self.touchID_ boolValue] && [[MPAppDelegate_Shared get] isFeatureUnlocked:MPProductTouchID];
+}
+
+- (void)setTouchID:(BOOL)aTouchID {
+
+    self.touchID_ = @(aTouchID);
+}
+
 - (MPSiteType)defaultType {

    return (MPSiteType)[self.defaultType_ unsignedIntegerValue]?: MPSiteTypeGeneratedLong;
--- a/MasterPassword/ObjC/MPKey.h
+++ b/MasterPassword/ObjC/MPKey.h
@@ -20,12 +20,20 @@

@protocol MPAlgorithm;

+typedef NS_ENUM(NSUInteger, MPKeyOrigin) {
+    MPKeyOriginMasterPassword,
+    MPKeyOriginKeyChain,
+    MPKeyOriginKeyChainBiometric,
+};
+
@interface MPKey : NSObject

@property(nonatomic, readonly) NSString *fullName;
+@property(nonatomic, readonly) MPKeyOrigin origin;

 - (instancetype)initForFullName:(NSString *)fullName withMasterPassword:(NSString *)masterPassword;
- (instancetype)initForFullName:(NSString *)fullName withKeyData:(NSData *)keyData forAlgorithm:(id<MPAlgorithm>)algorithm;
+- (instancetype)initForFullName:(NSString *)fullName withKeyData:(NSData *)keyData
+                   forAlgorithm:(id<MPAlgorithm>)algorithm keyOrigin:(MPKeyOrigin)origin;

 - (NSData *)keyIDForAlgorithm:(id<MPAlgorithm>)algorithm;
 - (NSData *)keyDataForAlgorithm:(id<MPAlgorithm>)algorithm;
--- a/MasterPassword/ObjC/MPKey.m
+++ b/MasterPassword/ObjC/MPKey.m
@@ -20,6 +20,7 @@
@interface MPKey()

@property(nonatomic) NSString *fullName;
+@property(nonatomic) MPKeyOrigin origin;
@property(nonatomic) NSString *masterPassword;

@end
@@ -35,16 +36,19 @@

    _keyCache = [NSCache new];
    self.fullName = fullName;
+    self.origin = MPKeyOriginMasterPassword;
    self.masterPassword = masterPassword;

    return self;
 }

- (instancetype)initForFullName:(NSString *)fullName withKeyData:(NSData *)keyData forAlgorithm:(id<MPAlgorithm>)algorithm {
+- (instancetype)initForFullName:(NSString *)fullName withKeyData:(NSData *)keyData
+                   forAlgorithm:(id<MPAlgorithm>)algorithm keyOrigin:(MPKeyOrigin)origin {

    if (!(self = [self initForFullName:fullName withMasterPassword:nil]))
        return nil;

+    self.origin = origin;
    [_keyCache setObject:keyData forKey:algorithm];

    return self;
--- a/MasterPassword/ObjC/MPUserEntity.h
+++ b/MasterPassword/ObjC/MPUserEntity.h
@@ -19,6 +19,7 @@
@property (nonatomic, retain) NSDate * lastUsed;
@property (nonatomic, retain) NSString * name;
@property (nonatomic, retain) NSNumber * saveKey_;
+@property (nonatomic, retain) NSNumber * touchID_;
@property (nonatomic, retain) NSNumber * version_;
@property (nonatomic, retain) NSSet *sites;
@end
--- a/MasterPassword/ObjC/MPUserEntity.m
+++ b/MasterPassword/ObjC/MPUserEntity.m
@@ -18,6 +18,7 @@
@dynamic lastUsed;
@dynamic name;
@dynamic saveKey_;
+@dynamic touchID_;
@dynamic version_;
@dynamic sites;

--- a/MasterPassword/ObjC/Mac/MPMacConfig.m
+++ b/MasterPassword/ObjC/Mac/MPMacConfig.m
@@ -16,7 +16,7 @@
        return self;

    [self.defaults registerDefaults:@{
-            NSStringFromSelector( @selector(iTunesID) )       : @"510296984",
+            NSStringFromSelector( @selector(appleID) )       : @"510296984",
    }];

    return self;
--- a/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/Mac/MasterPassword-Mac.xcodeproj/project.pbxproj
@@ -37,8 +37,6 @@
 		DA2CA4F018D323D3007798F8 /* NSArray+Pearl.h in Headers */ = {isa = PBXBuildFile; fileRef = DA2CA4EA18D323D3007798F8 /* NSArray+Pearl.h */; };
 		DA2CA4F118D323D3007798F8 /* NSTimer+PearlBlock.m in Sources */ = {isa = PBXBuildFile; fileRef = DA2CA4EB18D323D3007798F8 /* NSTimer+PearlBlock.m */; };
 		DA2CA4F218D323D3007798F8 /* NSTimer+PearlBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = DA2CA4EC18D323D3007798F8 /* NSTimer+PearlBlock.h */; };
-		DA30E9CE15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DA30E9CB15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h */; };
-		DA30E9CF15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30E9CC15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m */; };
 		DA30E9D015722ECA00A68B4C /* Pearl.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30E9CD15722ECA00A68B4C /* Pearl.m */; };
 		DA30E9D215722EE500A68B4C /* Pearl-Crypto.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30E9D115722EE500A68B4C /* Pearl-Crypto.m */; };
 		DA30E9D715723E6900A68B4C /* PearlLazy.h in Headers */ = {isa = PBXBuildFile; fileRef = DA30E9D515723E6900A68B4C /* PearlLazy.h */; };
@@ -91,7 +89,6 @@
 		DA6774451A474A3B004F356A /* mpw-types.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C21A4746AF004F356A /* mpw-types.c */; };
 		DA6774461A474A3B004F356A /* mpw-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6773C51A4746AF004F356A /* mpw-util.c */; };
 		DA67744A1A47C8F7004F356A /* mpw-tests-util.c in Sources */ = {isa = PBXBuildFile; fileRef = DA6774481A47C8F7004F356A /* mpw-tests-util.c */; };
-		DA8495301A915EF400B3053D /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA8495281A915EF400B3053D /* MasterPassword.xcdatamodeld */; };
 		DA89D4EC1A51EABD00AC64D7 /* Pearl-Cocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = DA89D4EA1A51EABD00AC64D7 /* Pearl-Cocoa.h */; };
 		DA89D4ED1A51EABD00AC64D7 /* Pearl-Cocoa.m in Sources */ = {isa = PBXBuildFile; fileRef = DA89D4EB1A51EABD00AC64D7 /* Pearl-Cocoa.m */; };
 		DA8ED895192906920099B726 /* PearlTween.m in Sources */ = {isa = PBXBuildFile; fileRef = DA8ED891192906920099B726 /* PearlTween.m */; };
@@ -102,6 +99,7 @@
 		DA9261521BE1A86700369DE5 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261501BE1A86700369DE5 /* Fabric.framework */; };
 		DA9261541BE1A88900369DE5 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261531BE1A88900369DE5 /* libc++.tbd */; };
 		DA9261561BE1A89600369DE5 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = DA9261551BE1A89600369DE5 /* libz.tbd */; };
+		DA95B5231C477DE10067F5EF /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA95B51A1C477DE10067F5EF /* MasterPassword.xcdatamodeld */; };
 		DAAA81B0195A8D1300FA30D9 /* gradient.png in Resources */ = {isa = PBXBuildFile; fileRef = DAAA81AF195A8D1300FA30D9 /* gradient.png */; };
 		DAADCC4719FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */; };
 		DAADCC4819FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h in Headers */ = {isa = PBXBuildFile; fileRef = DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */; };
@@ -158,6 +156,7 @@
 		DACA29741705E1A8002C6C22 /* dictionary.lst in Resources */ = {isa = PBXBuildFile; fileRef = DACA29721705E1A8002C6C22 /* dictionary.lst */; };
 		DACA298D1705E2BD002C6C22 /* JRSwizzle.h in Headers */ = {isa = PBXBuildFile; fileRef = DACA29771705E2BD002C6C22 /* JRSwizzle.h */; };
 		DACA299A1705E2BD002C6C22 /* JRSwizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = DACA298C1705E2BD002C6C22 /* JRSwizzle.m */; };
+		DACBFCDF1C59B22E007EF90F /* NSMutableSet+Pearl.m in Sources */ = {isa = PBXBuildFile; fileRef = DACBFCDC1C59B22E007EF90F /* NSMutableSet+Pearl.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 */; };
 		DAEB942E18B47FB3000490CC /* MPInitialWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA0933C91747A56A00DE1CEF /* MPInitialWindow.xib */; };
@@ -303,8 +302,6 @@
 		DA2CA4EA18D323D3007798F8 /* NSArray+Pearl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+Pearl.h"; sourceTree = "<group>"; };
 		DA2CA4EB18D323D3007798F8 /* NSTimer+PearlBlock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTimer+PearlBlock.m"; sourceTree = "<group>"; };
 		DA2CA4EC18D323D3007798F8 /* NSTimer+PearlBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTimer+PearlBlock.h"; sourceTree = "<group>"; };
-		DA30E9CB15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSBundle+PearlMutableInfo.h"; sourceTree = "<group>"; };
-		DA30E9CC15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSBundle+PearlMutableInfo.m"; sourceTree = "<group>"; };
 		DA30E9CD15722ECA00A68B4C /* Pearl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Pearl.m; sourceTree = "<group>"; };
 		DA30E9D115722EE500A68B4C /* Pearl-Crypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Pearl-Crypto.m"; sourceTree = "<group>"; };
 		DA30E9D515723E6900A68B4C /* PearlLazy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlLazy.h; sourceTree = "<group>"; };
@@ -792,13 +789,6 @@
 		DA831A281A6E1146000AC234 /* mpw-algorithm_v1.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v1.c"; sourceTree = "<group>"; };
 		DA831A291A6E1146000AC234 /* mpw-algorithm_v2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v2.c"; sourceTree = "<group>"; };
 		DA831A2A1A6E1146000AC234 /* mpw-algorithm_v3.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = "mpw-algorithm_v3.c"; sourceTree = "<group>"; };
-		DA8495291A915EF400B3053D /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
-		DA84952A1A915EF400B3053D /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
-		DA84952B1A915EF400B3053D /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = "<group>"; };
-		DA84952C1A915EF400B3053D /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
-		DA84952D1A915EF400B3053D /* MasterPassword 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 5.xcdatamodel"; sourceTree = "<group>"; };
-		DA84952E1A915EF400B3053D /* MasterPassword 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 6.xcdatamodel"; sourceTree = "<group>"; };
-		DA84952F1A915EF400B3053D /* MasterPassword 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 7.xcdatamodel"; sourceTree = "<group>"; };
 		DA89D4EA1A51EABD00AC64D7 /* Pearl-Cocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Pearl-Cocoa.h"; sourceTree = "<group>"; };
 		DA89D4EB1A51EABD00AC64D7 /* Pearl-Cocoa.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Pearl-Cocoa.m"; sourceTree = "<group>"; };
 		DA8ED891192906920099B726 /* PearlTween.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlTween.m; sourceTree = "<group>"; };
@@ -808,6 +798,14 @@
 		DA9261501BE1A86700369DE5 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = "<group>"; };
 		DA9261531BE1A88900369DE5 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		DA9261551BE1A89600369DE5 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+		DA95B51B1C477DE10067F5EF /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B51C1C477DE10067F5EF /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B51D1C477DE10067F5EF /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B51E1C477DE10067F5EF /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B51F1C477DE10067F5EF /* MasterPassword 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 5.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5201C477DE10067F5EF /* MasterPassword 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 6.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5211C477DE10067F5EF /* MasterPassword 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 7.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5221C477DE10067F5EF /* MasterPassword 8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 8.xcdatamodel"; sourceTree = "<group>"; };
 		DAAA81AF195A8D1300FA30D9 /* gradient.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gradient.png; sourceTree = "<group>"; };
 		DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+PearlEasyCleanup.h"; sourceTree = "<group>"; };
 		DAADCC3F19FAFFAD00987B1D /* NSPersistentStore+PearlMigration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSPersistentStore+PearlMigration.h"; sourceTree = "<group>"; };
@@ -867,6 +865,8 @@
 		DACA29721705E1A8002C6C22 /* dictionary.lst */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dictionary.lst; sourceTree = "<group>"; };
 		DACA29771705E2BD002C6C22 /* JRSwizzle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JRSwizzle.h; sourceTree = "<group>"; };
 		DACA298C1705E2BD002C6C22 /* JRSwizzle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JRSwizzle.m; sourceTree = "<group>"; };
+		DACBFCDB1C59B22E007EF90F /* NSMutableSet+Pearl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableSet+Pearl.h"; sourceTree = "<group>"; };
+		DACBFCDC1C59B22E007EF90F /* NSMutableSet+Pearl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableSet+Pearl.m"; sourceTree = "<group>"; };
 		DAD0C5F619FD6034009CB08D /* icon_128x128.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_128x128.png; sourceTree = "<group>"; };
 		DAD0C5F719FD6034009CB08D /* icon_128x128@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_128x128@2x.png"; sourceTree = "<group>"; };
 		DAD0C5F819FD6034009CB08D /* icon_16x16.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon_16x16.png; sourceTree = "<group>"; };
@@ -1059,9 +1059,9 @@
 		DA5E5C7917248AA1003798D8 /* lib */ = {
 			isa = PBXGroup;
 			children = (
-				DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */,
-				DAE8E65319867ADA00416A0F /* libopensslcrypto-osx.a */,
 				DAEB938518AB0FFD000490CC /* include */,
+				DAE8E65319867ADA00416A0F /* libopensslcrypto-osx.a */,
+				DA5E5C8717248AA1003798D8 /* libscryptenc-osx.a */,
 			);
 			path = lib;
 			sourceTree = "<group>";
@@ -1070,7 +1070,7 @@
 			isa = PBXGroup;
 			children = (
 				DA5E5CB21724A667003798D8 /* Mac */,
-				DA8495281A915EF400B3053D /* MasterPassword.xcdatamodeld */,
+				DA95B51A1C477DE10067F5EF /* MasterPassword.xcdatamodeld */,
 				DA5E5C971724A667003798D8 /* MPAlgorithm.h */,
 				DA5E5C981724A667003798D8 /* MPAlgorithm.m */,
 				DA5E5C991724A667003798D8 /* MPAlgorithmV0.h */,
@@ -1798,8 +1798,6 @@
 				93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */,
 				DA2CA4EA18D323D3007798F8 /* NSArray+Pearl.h */,
 				DA2CA4E918D323D3007798F8 /* NSArray+Pearl.m */,
-				DA30E9CB15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h */,
-				DA30E9CC15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m */,
 				DAFE4A63150399FF003ABA93 /* NSDateFormatter+RFC3339.h */,
 				DAFE4A63150399FF003ABA91 /* NSDateFormatter+RFC3339.m */,
 				93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */,
@@ -1808,6 +1806,8 @@
 				DA2CA4E718D323D3007798F8 /* NSError+PearlFullDescription.m */,
 				DA3B8451190FC86F00246EEA /* NSManagedObject+Pearl.h */,
 				DA3B8450190FC86F00246EEA /* NSManagedObject+Pearl.m */,
+				DACBFCDB1C59B22E007EF90F /* NSMutableSet+Pearl.h */,
+				DACBFCDC1C59B22E007EF90F /* NSMutableSet+Pearl.m */,
 				DAADCC3E19FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h */,
 				DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */,
 				DAFE45D915039823003ABA7C /* NSObject+PearlExport.m */,
@@ -1928,7 +1928,6 @@
 				DAFE4A3615039824003ABA7C /* PearlKeyChain.h in Headers */,
 				DAFE4A3815039824003ABA7C /* PearlRSAKey.h in Headers */,
 				DAFE4A3A15039824003ABA7C /* PearlSCrypt.h in Headers */,
-				DA30E9CE15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h in Headers */,
 				DA30E9D715723E6900A68B4C /* PearlLazy.h in Headers */,
 				DAADCC4719FAFFAD00987B1D /* NSNotificationCenter+PearlEasyCleanup.h in Headers */,
 				DAFE4A63150399FF003ABA88 /* NSObject+PearlKVO.h in Headers */,
@@ -2044,6 +2043,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = MP;
+				LastSwiftUpdateCheck = 0720;
 				LastTestingUpgradeCheck = 0510;
 				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = Lyndir;
@@ -2221,7 +2221,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = "/bin/sh -e";
-			shellScript = "../../../External/Mac/Crashlytics.framework/run \\\n    \"$(/usr/libexec/PlistBuddy -c \"Print :'API Key'\" ../../Resources/Crashlytics/Crashlytics.plist)\" 410fb41450e3a2e50fa8357682d812ecd3e1846f2141a99bdb9d3a6a981ad69c";
+			shellScript = "../../../External/Mac/Fabric.framework/run \\\n    \"$(/usr/libexec/PlistBuddy -c \"Print :'API Key'\" ../../Resources/Crashlytics/Crashlytics.plist)\" 410fb41450e3a2e50fa8357682d812ecd3e1846f2141a99bdb9d3a6a981ad69c";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -2236,6 +2236,7 @@
 				DA32CFE519CF1C71004F3F0E /* MPUserEntity.m in Sources */,
 				DA5E5CF71724A667003798D8 /* MPAlgorithmV0.m in Sources */,
 				DA5E5CF81724A667003798D8 /* MPAlgorithmV1.m in Sources */,
+				DACBFCDF1C59B22E007EF90F /* NSMutableSet+Pearl.m in Sources */,
 				DA6774311A4746AF004F356A /* mpw-util.c in Sources */,
 				DA5E5CF91724A667003798D8 /* MPAppDelegate_Key.m in Sources */,
 				DA5180CE19FF307E00A587E9 /* MPAppDelegate_Store.m in Sources */,
@@ -2257,7 +2258,7 @@
 				93D39784E725A34D1EE3FB3B /* MPInitialWindowController.m in Sources */,
 				DA32CFDF19CF1C70004F3F0E /* MPSiteEntity.m in Sources */,
 				93D394C4254EEB45FB335AFB /* MPSitesTableView.m in Sources */,
-				DA8495301A915EF400B3053D /* MasterPassword.xcdatamodeld in Sources */,
+				DA95B5231C477DE10067F5EF /* MasterPassword.xcdatamodeld in Sources */,
 				DA6774291A4746AF004F356A /* mpw-algorithm.c in Sources */,
 				93D395E4830290EBB6E71F34 /* MPNoStateButton.m in Sources */,
 				DA4DAE941A7D8117003E5423 /* MPAlgorithmV3.m in Sources */,
@@ -2319,7 +2320,6 @@
 				DAFE4A3915039824003ABA7C /* PearlRSAKey.m in Sources */,
 				DAFE4A3B15039824003ABA7C /* PearlSCrypt.m in Sources */,
 				DA8ED895192906920099B726 /* PearlTween.m in Sources */,
-				DA30E9CF15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m in Sources */,
 				DA2CA4F118D323D3007798F8 /* NSTimer+PearlBlock.m in Sources */,
 				DA3B8452190FC86F00246EEA /* NSManagedObject+Pearl.m in Sources */,
 				DA30E9D015722ECA00A68B4C /* Pearl.m in Sources */,
@@ -2562,6 +2562,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				CODE_SIGN_IDENTITY = "Mac Developer";
@@ -2572,6 +2573,7 @@
 				);
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib",
@@ -2579,6 +2581,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword.Mac;
 				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = NO;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				WRAPPER_NAME = "Master Password.${WRAPPER_EXTENSION}";
 			};
 			name = "Debug-Mac";
@@ -2587,6 +2590,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				CODE_SIGN_IDENTITY = "Developer ID Application";
@@ -2597,6 +2601,7 @@
 				);
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib",
@@ -2739,6 +2744,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
@@ -2749,6 +2755,7 @@
 				);
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"/Users/lhunath/Documents/workspace/lyndir/MasterPassword/External/Pearl/Pearl-Crypto/lib",
@@ -2946,18 +2953,19 @@
 /* End XCConfigurationList section */

 /* Begin XCVersionGroup section */
-		DA8495281A915EF400B3053D /* MasterPassword.xcdatamodeld */ = {
+		DA95B51A1C477DE10067F5EF /* MasterPassword.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
-				DA8495291A915EF400B3053D /* MasterPassword 1.xcdatamodel */,
-				DA84952A1A915EF400B3053D /* MasterPassword 2.xcdatamodel */,
-				DA84952B1A915EF400B3053D /* MasterPassword 3.xcdatamodel */,
-				DA84952C1A915EF400B3053D /* MasterPassword 4.xcdatamodel */,
-				DA84952D1A915EF400B3053D /* MasterPassword 5.xcdatamodel */,
-				DA84952E1A915EF400B3053D /* MasterPassword 6.xcdatamodel */,
-				DA84952F1A915EF400B3053D /* MasterPassword 7.xcdatamodel */,
+				DA95B51B1C477DE10067F5EF /* MasterPassword 1.xcdatamodel */,
+				DA95B51C1C477DE10067F5EF /* MasterPassword 2.xcdatamodel */,
+				DA95B51D1C477DE10067F5EF /* MasterPassword 3.xcdatamodel */,
+				DA95B51E1C477DE10067F5EF /* MasterPassword 4.xcdatamodel */,
+				DA95B51F1C477DE10067F5EF /* MasterPassword 5.xcdatamodel */,
+				DA95B5201C477DE10067F5EF /* MasterPassword 6.xcdatamodel */,
+				DA95B5211C477DE10067F5EF /* MasterPassword 7.xcdatamodel */,
+				DA95B5221C477DE10067F5EF /* MasterPassword 8.xcdatamodel */,
 			);
-			currentVersion = DA84952F1A915EF400B3053D /* MasterPassword 7.xcdatamodel */;
+			currentVersion = DA95B5221C477DE10067F5EF /* MasterPassword 8.xcdatamodel */;
 			path = MasterPassword.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
--- a/MasterPassword/ObjC/Mac/MasterPassword-Prefix.pch
+++ b/MasterPassword/ObjC/Mac/MasterPassword-Prefix.pch
@@ -28,42 +28,80 @@
 #import <CoreFoundation/CFString.h>
 #import <objc/runtime.h>
 #import <objc/message.h>
+#import <objc/NSObjCRuntime.h>
+#import <stdlib.h>

-#define trc(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:trc:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define dbg(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:dbg:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define inf(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:inf:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define wrn(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:wrn:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define err(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:err:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define ftl(format, ...) do{objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:ftl:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__); abort(); } while (0)
+#define trc(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 0, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define dbg(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 1, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define inf(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 2, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define wrn(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 3, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define err(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 4, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define ftl(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 5, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+        abort(); \
+    } while (0)

 #endif
--- a/MasterPassword/ObjC/MasterPassword.xcdatamodeld/.xccurrentversion
+++ b/MasterPassword/ObjC/MasterPassword.xcdatamodeld/.xccurrentversion
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>MasterPassword 7.xcdatamodel</string>
+	<string>MasterPassword 8.xcdatamodel</string>
 </dict>
 </plist>
--- a/MasterPassword/ObjC/MasterPassword.xcdatamodeld/MasterPassword
+++ b/MasterPassword/ObjC/MasterPassword.xcdatamodeld/MasterPassword
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="9525" systemVersion="15C50" minimumToolsVersion="Automatic">
+    <entity name="MPGeneratedSiteEntity" representedClassName="MPGeneratedSiteEntity" parentEntity="MPSiteEntity" elementID="789304EA-070D-4982-8C20-54EECFC20CB6" syncable="YES">
+        <attribute name="counter_" optional="YES" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+    </entity>
+    <entity name="MPSiteEntity" representedClassName="MPSiteEntity" isAbstract="YES" elementID="58EE245C-6827-4C11-BB7E-5722F2426EC2" syncable="YES">
+        <attribute name="content" optional="YES" transient="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="lastUsed" attributeType="Date" indexed="YES" syncable="YES"/>
+        <attribute name="loginGenerated_" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
+        <attribute name="loginName" optional="YES" attributeType="String" elementID="A1B9F981-D33C-4BFE-9F94-C9D3E1F78E51" syncable="YES"/>
+        <attribute name="name" attributeType="String" minValueString="1" indexed="YES" syncable="YES"/>
+        <attribute name="requiresExplicitMigration_" attributeType="Boolean" defaultValueString="NO">
+            <userInfo/>
+        </attribute>
+        <attribute name="type_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
+        <attribute name="uses_" attributeType="Integer 16" defaultValueString="0" indexed="YES" syncable="YES"/>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="0" syncable="YES"/>
+        <relationship name="questions" optional="YES" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="MPSiteQuestionEntity" inverseName="site" inverseEntity="MPSiteQuestionEntity" syncable="YES"/>
+        <relationship name="user" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="MPUserEntity" inverseName="sites" inverseEntity="MPUserEntity" elementID="FC8AE32E-7BE3-4FA6-8611-B7DC0DB063EF" syncable="YES"/>
+    </entity>
+    <entity name="MPSiteQuestionEntity" representedClassName="MPSiteQuestionEntity" syncable="YES">
+        <attribute name="keyword" attributeType="String" syncable="YES"/>
+        <relationship name="site" maxCount="1" deletionRule="Nullify" destinationEntity="MPSiteEntity" inverseName="questions" inverseEntity="MPSiteEntity" syncable="YES"/>
+    </entity>
+    <entity name="MPStoredSiteEntity" representedClassName="MPStoredSiteEntity" parentEntity="MPSiteEntity" elementID="BEEF1688-0CCD-4699-A86A-4D860FE2CEB8" syncable="YES">
+        <attribute name="contentObject" optional="YES" attributeType="Transformable" storedInTruthFile="YES" syncable="YES"/>
+    </entity>
+    <entity name="MPUserEntity" representedClassName="MPUserEntity" syncable="YES">
+        <attribute name="avatar_" attributeType="Integer 16" defaultValueString="0" syncable="YES"/>
+        <attribute name="defaultType_" attributeType="Integer 16" defaultValueString="17" syncable="YES"/>
+        <attribute name="keyID" optional="YES" attributeType="Binary" syncable="YES"/>
+        <attribute name="lastUsed" optional="YES" attributeType="Date" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="saveKey_" attributeType="Boolean" defaultValueString="NO">
+            <userInfo/>
+        </attribute>
+        <attribute name="touchID_" attributeType="Boolean" defaultValueString="0">
+            <userInfo/>
+        </attribute>
+        <attribute name="version_" attributeType="Integer 16" minValueString="0" defaultValueString="2" syncable="YES"/>
+        <relationship name="sites" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="MPSiteEntity" inverseName="user" inverseEntity="MPSiteEntity" elementID="D18D6772-040E-4CFE-8F32-A34B08E9E9BC" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="MPGeneratedSiteEntity" positionX="216" positionY="-288" width="128" height="58"/>
+        <element name="MPSiteEntity" positionX="-0" positionY="-286" width="128" height="208"/>
+        <element name="MPSiteQuestionEntity" positionX="-2" positionY="-9" width="128" height="73"/>
+        <element name="MPStoredSiteEntity" positionX="214" positionY="-171" width="128" height="58"/>
+        <element name="MPUserEntity" positionX="-218" positionY="-288" width="128" height="178"/>
+    </elements>
+</model>
--- a/MasterPassword/ObjC/iOS/MPAvatarCell.h
+++ b/MasterPassword/ObjC/iOS/MPAvatarCell.h
@@ -33,7 +33,7 @@ typedef NS_ENUM(NSUInteger, MPAvatarMode) {

@interface MPAvatarCell : UICollectionViewCell 
@property (copy, nonatomic) NSString *name;
-@property (assign, nonatomic) long avatar;
+@property (assign, nonatomic) NSUInteger avatar;
@property (assign, nonatomic) MPAvatarMode mode;
@property (assign, nonatomic) CGFloat visibility;
@property (assign, nonatomic) BOOL spinnerActive;
--- a/MasterPassword/ObjC/iOS/MPAvatarCell.m
+++ b/MasterPassword/ObjC/iOS/MPAvatarCell.m
@@ -111,7 +111,7 @@ const long MPAvatarAdd = 10000;

 #pragma mark - Properties

- (void)setAvatar:(long)avatar {
+- (void)setAvatar:(NSUInteger)avatar {

    _avatar = avatar == MPAvatarAdd? MPAvatarAdd: (avatar + MPAvatarCount) % MPAvatarCount;

@@ -121,7 +121,7 @@ const long MPAvatarAdd = 10000;
        _newUser = YES;
    }
    else
-        self.avatarImageView.image = [UIImage imageNamed:strf( @"avatar-%ld", _avatar )];
+        self.avatarImageView.image = [UIImage imageNamed:strf( @"avatar-%lu", (unsigned long)_avatar )];
 }

 - (NSString *)name {
--- a/MasterPassword/ObjC/iOS/MPPreferencesViewController.h
+++ b/MasterPassword/ObjC/iOS/MPPreferencesViewController.h
@@ -12,6 +12,7 @@
@interface MPPreferencesViewController : UITableViewController

@property(weak, nonatomic) IBOutlet UISwitch *savePasswordSwitch;
+@property(weak, nonatomic) IBOutlet UISwitch *touchIDSwitch;
@property(weak, nonatomic) IBOutlet UITableViewCell *signOutCell;
@property(weak, nonatomic) IBOutlet UITableViewCell *feedbackCell;
@property(weak, nonatomic) IBOutlet UITableViewCell *showHelpCell;
--- a/MasterPassword/ObjC/iOS/MPPreferencesViewController.m
+++ b/MasterPassword/ObjC/iOS/MPPreferencesViewController.m
@@ -12,7 +12,7 @@
 #import "MPAppDelegate_Store.h"
 #import "UIColor+Expanded.h"
 #import "MPPasswordsViewController.h"
-#import "MPCoachmarkViewController.h"
+#import "MPAppDelegate_InApp.h"

@interface MPPreferencesViewController()

@@ -25,6 +25,10 @@
    [super viewDidLoad];

    self.view.backgroundColor = [UIColor clearColor];
+
+    self.tableView.rowHeight = UITableViewAutomaticDimension;
+    self.tableView.estimatedRowHeight = 100;
+    self.tableView.contentInset = UIEdgeInsetsMake( 64, 0, 49, 0 );
 }

 - (void)viewWillAppear:(BOOL)animated {
@@ -35,13 +39,18 @@
    if (![[NSUserDefaults standardUserDefaults] synchronize])
        wrn( @"Couldn't synchronize after preferences appearance." );

+    [self reload];
+}
+
+- (void)reload {
+
    MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserForMainThread];
    self.generatedTypeControl.selectedSegmentIndex = [self generatedSegmentIndexForType:activeUser.defaultType];
    self.storedTypeControl.selectedSegmentIndex = [self storedSegmentIndexForType:activeUser.defaultType];
-    self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%ld", (long)activeUser.avatar )];
+    self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%lu", (unsigned long)activeUser.avatar )];
    self.savePasswordSwitch.on = activeUser.saveKey;
-
-    self.tableView.contentInset = UIEdgeInsetsMake( 64, 0, 49, 0 );
+    self.touchIDSwitch.on = activeUser.touchID;
+    self.touchIDSwitch.enabled = self.savePasswordSwitch.on && [[MPiOSAppDelegate get] isFeatureUnlocked:MPProductTouchID];
 }

 #pragma mark - UITableViewDelegate
@@ -57,6 +66,11 @@
    return cell;
 }

+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+
+    return UITableViewAutomaticDimension;
+}
+
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {

    UITableViewCell *cell = [self tableView:tableView cellForRowAtIndexPath:indexPath];
@@ -96,6 +110,24 @@
            else
                [[MPiOSAppDelegate get] forgetSavedKeyFor:activeUser];
            [context saveToStore];
+
+            PearlMainQueue(^{
+                [self reload];
+            });
+        }];
+
+    if (sender == self.touchIDSwitch)
+        [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+            MPUserEntity *activeUser = [[MPiOSAppDelegate get] activeUserInContext:context];
+            if ((activeUser.touchID = self.touchIDSwitch.on))
+                [[MPiOSAppDelegate get] storeSavedKeyFor:activeUser];
+            else
+                [[MPiOSAppDelegate get] forgetSavedKeyFor:activeUser];
+            [context saveToStore];
+
+            PearlMainQueue( ^{
+                [self reload];
+            } );
        }];

    if (sender == self.generatedTypeControl || sender == self.storedTypeControl) {
@@ -104,13 +136,13 @@
        else if (sender == self.storedTypeControl)
            self.generatedTypeControl.selectedSegmentIndex = -1;

+        MPSiteType defaultType = [self typeForSelectedSegment];
        [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
-            MPSiteType defaultType = [[MPiOSAppDelegate get] activeUserInContext:context].defaultType = [self typeForSelectedSegment];
+            [[MPiOSAppDelegate get] activeUserInContext:context].defaultType = defaultType;
            [context saveToStore];

            PearlMainQueue( ^{
-                self.generatedTypeControl.selectedSegmentIndex = [self generatedSegmentIndexForType:defaultType];
-                self.storedTypeControl.selectedSegmentIndex = [self storedSegmentIndexForType:defaultType];
+                [self reload];
            } );
        }];
    }
@@ -123,9 +155,9 @@
        activeUser.avatar = (activeUser.avatar - 1 + MPAvatarCount) % MPAvatarCount;
        [context saveToStore];

-        long avatar = activeUser.avatar;
+        NSUInteger avatar = activeUser.avatar;
        PearlMainQueue( ^{
-            self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%ld", avatar )];
+            self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%lu", (unsigned long)avatar )];
        } );
    }];
 }
@@ -137,9 +169,9 @@
        activeUser.avatar = (activeUser.avatar + 1 + MPAvatarCount) % MPAvatarCount;
        [context saveToStore];

-        long avatar = activeUser.avatar;
+        NSUInteger avatar = activeUser.avatar;
        PearlMainQueue( ^{
-            self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%ld", avatar )];
+            self.avatarImage.image = [UIImage imageNamed:strf( @"avatar-%lu", (unsigned long)avatar )];
        } );
    }];
 }
--- a/MasterPassword/ObjC/iOS/MPStoreViewController.m
+++ b/MasterPassword/ObjC/iOS/MPStoreViewController.m
@@ -28,7 +28,8 @@ PearlEnum( MPDevelopmentFuelConsumption,

    NSMutableString *features = [NSMutableString string];
    NSArray *storeVersions = @[
-            @"Generated Usernames\nSecurity Question Answers"
+            @"Generated Usernames\nSecurity Question Answers",
+            @"TouchID Support"
    ];
    NSInteger storeVersion = [[NSUserDefaults standardUserDefaults] integerForKey:@"storeVersion"];
    for (; storeVersion < [storeVersions count]; ++storeVersion)
@@ -51,6 +52,8 @@ PearlEnum( MPDevelopmentFuelConsumption,

    self.tableView.tableHeaderView = [UIView new];
    self.tableView.tableFooterView = [UIView new];
+    self.tableView.rowHeight = UITableViewAutomaticDimension;
+    self.tableView.estimatedRowHeight = 400;
    self.view.backgroundColor = [UIColor clearColor];
 }

@@ -89,18 +92,6 @@ PearlEnum( MPDevelopmentFuelConsumption,
 - (MPStoreProductCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {

    MPStoreProductCell *cell = (MPStoreProductCell *)[super tableView:tableView cellForRowAtIndexPath:indexPath];
-    if (cell.contentView.translatesAutoresizingMaskIntoConstraints) {
-        cell.contentView.translatesAutoresizingMaskIntoConstraints = NO;
-        [cell addConstraints:@[
-                [NSLayoutConstraint constraintWithItem:cell attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual
-                                                toItem:cell.contentView attribute:NSLayoutAttributeTop multiplier:1 constant:0],
-                [NSLayoutConstraint constraintWithItem:cell attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual
-                                                toItem:cell.contentView attribute:NSLayoutAttributeRight multiplier:1 constant:0],
-                [NSLayoutConstraint constraintWithItem:cell attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual
-                                                toItem:cell.contentView attribute:NSLayoutAttributeLeft multiplier:1 constant:0],
-        ]];
-    }
-
    if (indexPath.section == 0)
        cell.selectionStyle = [[MPiOSAppDelegate get] isFeatureUnlocked:[self productForCell:cell].productIdentifier]?
                              UITableViewCellSelectionStyleNone: UITableViewCellSelectionStyleDefault;
@@ -122,11 +113,7 @@ PearlEnum( MPDevelopmentFuelConsumption,

 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {

-    UITableViewCell *cell = [self tableView:tableView cellForRowAtIndexPath:indexPath];
-    [cell layoutIfNeeded];
-    [cell layoutIfNeeded];
-
-    dbg_return_tr( cell.contentView.bounds.size.height, @, indexPath );
+    return UITableViewAutomaticDimension;
 }

 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
--- a/MasterPassword/ObjC/iOS/MPUsersViewController.m
+++ b/MasterPassword/ObjC/iOS/MPUsersViewController.m
@@ -147,12 +147,13 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
            case MPActiveUserStateLogin: {
                self.entryField.enabled = NO;
                [self selectedAvatar].spinnerActive = YES;
-                [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+                NSString *masterPassword = self.entryField.text;
+                if (![MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
                    BOOL signedIn = NO, isNew = NO;
                    MPUserEntity *user = [self selectedUserInContext:context isNew:&isNew];
                    if (!isNew && user)
                        signedIn = [[MPiOSAppDelegate get] signInAsUser:user saveInContext:context
-                                                    usingMasterPassword:self.entryField.text];
+                                                    usingMasterPassword:masterPassword];

                    [[NSOperationQueue mainQueue] addOperationWithBlock:^{
                        self.entryField.text = @"";
@@ -165,7 +166,10 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
                            return;
                        }
                    }];
-                }];
+                }]) {
+                    self.entryField.enabled = YES;
+                    [self selectedAvatar].spinnerActive = NO;
+                }
                break;
            }
            case MPActiveUserStateUserName: {
@@ -209,21 +213,24 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
                self.entryField.enabled = NO;
                MPAvatarCell *avatarCell = [self selectedAvatar];
                avatarCell.spinnerActive = YES;
+                NSUInteger newUserAvatar = avatarCell.avatar;
+                NSString *newUserName = avatarCell.name;
                if (![MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
                    BOOL isNew = NO;
                    MPUserEntity *user = [self userForAvatar:avatarCell inContext:context isNew:&isNew];
                    if (isNew) {
                        user = [MPUserEntity insertNewObjectInContext:context];
                        user.algorithm = MPAlgorithmDefault;
-                        user.avatar = avatarCell.avatar;
-                        user.name = avatarCell.name;
+                        user.avatar = newUserAvatar;
+                        user.name = newUserName;
                    }

-                    BOOL signedIn = [[MPiOSAppDelegate get] signInAsUser:user saveInContext:context usingMasterPassword:masterPassword];
+                    BOOL signedIn = [[MPiOSAppDelegate get] signInAsUser:user saveInContext:context
+                                                     usingMasterPassword:masterPassword];
                    PearlMainQueue( ^{
                        self.entryField.text = @"";
                        self.entryField.enabled = YES;
-                        [self selectedAvatar].spinnerActive = NO;
+                        avatarCell.spinnerActive = NO;

                        if (!signedIn) {
                            // Sign in failed, shouldn't happen for a new user.
@@ -232,8 +239,10 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
                            return;
                        }
                    } );
-                }])
+                }]) {
+                    self.entryField.enabled = YES;
                    avatarCell.spinnerActive = NO;
+                }

                break;
            }
@@ -356,17 +365,28 @@ referenceSizeForFooterInSection:(NSInteger)section {
            self.activeUserState = MPActiveUserStateLogin;

            self.entryField.enabled = NO;
-            [self selectedAvatar].spinnerActive = YES;
-            BOOL signedIn = NO;
-            if (!isNew && mainUser)
-                signedIn = [[MPiOSAppDelegate get] signInAsUser:mainUser saveInContext:mainContext usingMasterPassword:nil];
+            MPAvatarCell *userAvatar = [self selectedAvatar];
+            userAvatar.spinnerActive = YES;
+            if (!isNew && mainUser && [MPiOSAppDelegate managedObjectContextPerformBlock:^(NSManagedObjectContext *context) {
+                MPUserEntity *user = [MPUserEntity existingObjectWithID:mainUser.objectID inContext:context];
+                BOOL signedIn = [[MPiOSAppDelegate get] signInAsUser:user saveInContext:mainContext usingMasterPassword:nil];
+                
+                PearlMainQueue(^{
+                    self.entryField.text = @"";
+                    self.entryField.enabled = YES;
+                    userAvatar.spinnerActive = NO;
+
+                    if (!signedIn)
+                        [self.entryField becomeFirstResponder];
+                });
+            }])
+                return;

            self.entryField.text = @"";
            self.entryField.enabled = YES;
-            [self selectedAvatar].spinnerActive = NO;
+            userAvatar.spinnerActive = NO;

-            if (!signedIn)
-                [self.entryField becomeFirstResponder];
+            [self.entryField becomeFirstResponder];
        }
    }
 }
--- a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m
+++ b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m
@@ -36,8 +36,8 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {

    @try {
-        [[NSBundle mainBundle] mutableInfoDictionary][@"CFBundleDisplayName"] = @"Master Password";
-        [[NSBundle mainBundle] mutableLocalizedInfoDictionary][@"CFBundleDisplayName"] = @"Master Password";
+//        [[NSBundle mainBundle] mutableInfoDictionary][@"CFBundleDisplayName"] = @"Master Password";
+//        [[NSBundle mainBundle] mutableLocalizedInfoDictionary][@"CFBundleDisplayName"] = @"Master Password";

 #ifdef CRASHLYTICS
        NSString *crashlyticsAPIKey = [self crashlyticsAPIKey];
--- a/MasterPassword/ObjC/iOS/MPiOSConfig.m
+++ b/MasterPassword/ObjC/iOS/MPiOSConfig.m
@@ -20,7 +20,7 @@
            NSStringFromSelector( @selector( helpHidden ) )             : @NO,
            NSStringFromSelector( @selector( siteInfoHidden ) )         : @YES,
            NSStringFromSelector( @selector( showSetup ) )              : @YES,
-            NSStringFromSelector( @selector( iTunesID ) )               : @"510296984",
+            NSStringFromSelector( @selector( appleID ) )                : @"510296984",
            NSStringFromSelector( @selector( actionsTipShown ) )        : @(!self.firstRun),
            NSStringFromSelector( @selector( typeTipShown ) )           : @(!self.firstRun),
            NSStringFromSelector( @selector( loginNameTipShown ) )      : @NO,
--- a/MasterPassword/ObjC/iOS/MasterPassword-Info.plist
+++ b/MasterPassword/ObjC/iOS/MasterPassword-Info.plist
@@ -60,7 +60,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2011-2014 Lyndir</string>
+	<string>© 2011-2016 Lyndir</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>Exo2.0-Bold.otf</string>
--- a/MasterPassword/ObjC/iOS/MasterPassword-Prefix.pch
+++ b/MasterPassword/ObjC/iOS/MasterPassword-Prefix.pch
@@ -28,42 +28,80 @@
 #import <CoreFoundation/CFString.h>
 #import <objc/runtime.h>
 #import <objc/message.h>
+#import <objc/NSObjCRuntime.h>
+#import <stdlib.h>

-#define trc(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:trc:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define dbg(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:dbg:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define inf(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:inf:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define wrn(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:wrn:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define err(format, ...)    objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:err:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__)
-#define ftl(format, ...) do{objc_msgSend( \
-                                objc_msgSend( (id)objc_getClass("PearlLogger"), sel_getUid( "get" ) ), \
-                                sel_getUid( "inFile:atLine:ftl:" ), \
-                                basename( (char *)__FILE__ ), __LINE__, \
-                                          CFStringCreateWithCString( NULL, format, kCFStringEncodingUTF8 ), \
-                                          ##__VA_ARGS__); abort(); } while (0)
+#define trc(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 0, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define dbg(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 1, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define inf(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 2, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define wrn(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 3, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define err(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 4, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+    } while (0)
+
+#define ftl(format, ...) \
+    do { \
+        char *_msg = NULL; \
+        asprintf( &_msg, format, ##__VA_ARGS__ ); \
+        void (*_sendMsg)(id, SEL, CFStringRef, NSInteger, CFStringRef, NSUInteger, CFStringRef) = (void *)objc_msgSend; \
+        _sendMsg( objc_msgSend( (id)objc_getClass( "PearlLogger" ), sel_getUid( "get" ) ), \
+                sel_getUid( "inFile:atLine:fromFunction:withLevel:text:" ), \
+                CFStringCreateWithCString( NULL, basename( (char *)__FILE__ ), kCFStringEncodingUTF8 ), __LINE__, \
+                CFStringCreateWithCString( NULL, __FUNCTION__, kCFStringEncodingUTF8 ), 5, \
+                CFStringCreateWithCString( NULL, _msg, kCFStringEncodingUTF8 ) ); \
+        abort(); \
+    } while (0)

 #endif
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -106,8 +106,6 @@
 		DA2CA4E018D28859007798F8 /* NSTimer+PearlBlock.h in Headers */ = {isa = PBXBuildFile; fileRef = DA2CA4DC18D28859007798F8 /* NSTimer+PearlBlock.h */; };
 		DA2CA4E418D28866007798F8 /* NSLayoutConstraint+PearlUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = DA2CA4E218D28866007798F8 /* NSLayoutConstraint+PearlUIKit.h */; };
 		DA2CA4E618D2AC10007798F8 /* NSLayoutConstraint+PearlUIKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DA2CA4E518D2AC10007798F8 /* NSLayoutConstraint+PearlUIKit.m */; };
-		DA30E9CE15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = DA30E9CB15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h */; };
-		DA30E9CF15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30E9CC15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m */; };
 		DA30E9D015722ECA00A68B4C /* Pearl.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30E9CD15722ECA00A68B4C /* Pearl.m */; };
 		DA30E9D215722EE500A68B4C /* Pearl-Crypto.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30E9D115722EE500A68B4C /* Pearl-Crypto.m */; };
 		DA30E9D415722EF400A68B4C /* Pearl-UIKit.m in Sources */ = {isa = PBXBuildFile; fileRef = DA30E9D315722EF400A68B4C /* Pearl-UIKit.m */; };
@@ -117,7 +115,6 @@
 		DA32CFF119CF1C8F004F3F0E /* MPStoredSiteEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32CFE819CF1C8F004F3F0E /* MPStoredSiteEntity.m */; };
 		DA32CFF319CF1C8F004F3F0E /* MPSiteEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32CFEC19CF1C8F004F3F0E /* MPSiteEntity.m */; };
 		DA32CFF419CF1C8F004F3F0E /* MPGeneratedSiteEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32CFEE19CF1C8F004F3F0E /* MPGeneratedSiteEntity.m */; };
-		DA32D00819CF4735004F3F0E /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA32D00119CF4735004F3F0E /* MasterPassword.xcdatamodeld */; };
 		DA32D00919CF5C55004F3F0E /* icon_question.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37FE1711E29600CF925C /* icon_question.png */; };
 		DA32D00A19CF5C55004F3F0E /* icon_question@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DABD37FF1711E29600CF925C /* icon_question@2x.png */; };
 		DA32D01A19D046E1004F3F0E /* PearlFixedTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */; };
@@ -186,6 +183,9 @@
 		DA854C8418D4CFBF00106317 /* avatar-add.png in Resources */ = {isa = PBXBuildFile; fileRef = DA854C8218D4CFBF00106317 /* avatar-add.png */; };
 		DA92614E1BE1A57500369DE5 /* MPAppDelegate_InApp.m in Sources */ = {isa = PBXBuildFile; fileRef = DA92614D1BE1A57500369DE5 /* MPAppDelegate_InApp.m */; };
 		DA945C8717E3F3FD0053236B /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA945C8617E3F3FD0053236B /* Images.xcassets */; };
+		DA95B50C1C476B6A0067F5EF /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA95B50B1C476B6A0067F5EF /* LocalAuthentication.framework */; };
+		DA95B50F1C4776F00067F5EF /* NSMutableSet+Pearl.m in Sources */ = {isa = PBXBuildFile; fileRef = DA95B50E1C4776F00067F5EF /* NSMutableSet+Pearl.m */; };
+		DA95B5191C477DB50067F5EF /* MasterPassword.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = DA95B5101C477DB50067F5EF /* MasterPassword.xcdatamodeld */; };
 		DA95D5F214DF0B2C008D1B94 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA95D5F014DF0B1E008D1B94 /* MessageUI.framework */; };
 		DAA141201922FF020032B392 /* PearlTween.m in Sources */ = {isa = PBXBuildFile; fileRef = DAA1411C1922FF020032B392 /* PearlTween.m */; };
 		DAA141211922FF020032B392 /* PearlTween.h in Headers */ = {isa = PBXBuildFile; fileRef = DAA1411D1922FF020032B392 /* PearlTween.h */; };
@@ -599,7 +599,6 @@
 		DA29992D19C86F5700AF7DF1 /* thumb_generated_login@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumb_generated_login@2x.png"; sourceTree = "<group>"; };
 		DA29992E19C86F5700AF7DF1 /* thumb_generated_login.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = thumb_generated_login.png; sourceTree = "<group>"; };
 		DA29993119C9132F00AF7DF1 /* thumb_generated_login@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "thumb_generated_login@3x.png"; sourceTree = "<group>"; };
-		DA2C3D5E1BD95DEF001137B3 /* libscryptenc-ios-dev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-ios-dev.a"; sourceTree = "<group>"; };
 		DA2C3D601BD95EEE001137B3 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Fabric.framework; path = ../../../External/iOS/Fabric.framework; sourceTree = "<group>"; };
 		DA2C3D621BD96126001137B3 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		DA2C3D641BD9612F001137B3 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
@@ -609,8 +608,6 @@
 		DA2CA4DC18D28859007798F8 /* NSTimer+PearlBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTimer+PearlBlock.h"; sourceTree = "<group>"; };
 		DA2CA4E218D28866007798F8 /* NSLayoutConstraint+PearlUIKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSLayoutConstraint+PearlUIKit.h"; sourceTree = "<group>"; };
 		DA2CA4E518D2AC10007798F8 /* NSLayoutConstraint+PearlUIKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSLayoutConstraint+PearlUIKit.m"; sourceTree = "<group>"; };
-		DA30E9CB15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSBundle+PearlMutableInfo.h"; sourceTree = "<group>"; };
-		DA30E9CC15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSBundle+PearlMutableInfo.m"; sourceTree = "<group>"; };
 		DA30E9CD15722ECA00A68B4C /* Pearl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Pearl.m; sourceTree = "<group>"; };
 		DA30E9D115722EE500A68B4C /* Pearl-Crypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Pearl-Crypto.m"; sourceTree = "<group>"; };
 		DA30E9D315722EF400A68B4C /* Pearl-UIKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Pearl-UIKit.m"; sourceTree = "<group>"; };
@@ -624,12 +621,6 @@
 		DA32CFED19CF1C8F004F3F0E /* MPSiteEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSiteEntity.h; sourceTree = "<group>"; };
 		DA32CFEE19CF1C8F004F3F0E /* MPGeneratedSiteEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPGeneratedSiteEntity.m; sourceTree = "<group>"; };
 		DA32CFEF19CF1C8F004F3F0E /* MPGeneratedSiteEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPGeneratedSiteEntity.h; sourceTree = "<group>"; };
-		DA32D00219CF4735004F3F0E /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
-		DA32D00319CF4735004F3F0E /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
-		DA32D00419CF4735004F3F0E /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = "<group>"; };
-		DA32D00519CF4735004F3F0E /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
-		DA32D00619CF4735004F3F0E /* MasterPassword 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 5.xcdatamodel"; sourceTree = "<group>"; };
-		DA32D00719CF4735004F3F0E /* MasterPassword 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 6.xcdatamodel"; sourceTree = "<group>"; };
 		DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlFixedTableView.m; sourceTree = "<group>"; };
 		DA32D01919D046E1004F3F0E /* PearlFixedTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PearlFixedTableView.h; sourceTree = "<group>"; };
 		DA32D02019D111C6004F3F0E /* libKCOrderedAccessorFix.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKCOrderedAccessorFix.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -673,13 +664,24 @@
 		DA67460C18DE7F0C00DFE240 /* Exo2.0-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Exo2.0-Bold.otf"; sourceTree = "<group>"; };
 		DA6774351A4749CC004F356A /* mpw-tests.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "mpw-tests.c"; sourceTree = "<group>"; };
 		DA70EC7F1811B13C00F65DB2 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
-		DA72BD7719C137D500E6ACFE /* libopensslcrypto-ios-dev.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libopensslcrypto-ios-dev.a"; sourceTree = "<group>"; };
-		DA8495271A9146E600B3053D /* MasterPassword 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 7.xcdatamodel"; sourceTree = "<group>"; };
+		DA7F2C5E1C48B70D00404A26 /* libopensslcrypto-ios-sim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libopensslcrypto-ios-sim.a"; sourceTree = "<group>"; };
+		DA7F2C5F1C48B70D00404A26 /* libscryptenc-ios-sim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libscryptenc-ios-sim.a"; sourceTree = "<group>"; };
 		DA854C8118D4CFBF00106317 /* avatar-add@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-add@2x.png"; sourceTree = "<group>"; };
 		DA854C8218D4CFBF00106317 /* avatar-add.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "avatar-add.png"; sourceTree = "<group>"; };
 		DA92614C1BE1A57500369DE5 /* MPAppDelegate_InApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAppDelegate_InApp.h; sourceTree = "<group>"; };
 		DA92614D1BE1A57500369DE5 /* MPAppDelegate_InApp.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate_InApp.m; sourceTree = "<group>"; };
 		DA945C8617E3F3FD0053236B /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		DA95B50B1C476B6A0067F5EF /* LocalAuthentication.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalAuthentication.framework; path = System/Library/Frameworks/LocalAuthentication.framework; sourceTree = SDKROOT; };
+		DA95B50D1C4776F00067F5EF /* NSMutableSet+Pearl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableSet+Pearl.h"; sourceTree = "<group>"; };
+		DA95B50E1C4776F00067F5EF /* NSMutableSet+Pearl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableSet+Pearl.m"; sourceTree = "<group>"; };
+		DA95B5111C477DB50067F5EF /* MasterPassword 1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 1.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5121C477DB50067F5EF /* MasterPassword 2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 2.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5131C477DB50067F5EF /* MasterPassword 3.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 3.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5141C477DB50067F5EF /* MasterPassword 4.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 4.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5151C477DB50067F5EF /* MasterPassword 5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 5.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5161C477DB50067F5EF /* MasterPassword 6.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 6.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5171C477DB50067F5EF /* MasterPassword 7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 7.xcdatamodel"; sourceTree = "<group>"; };
+		DA95B5181C477DB50067F5EF /* MasterPassword 8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "MasterPassword 8.xcdatamodel"; sourceTree = "<group>"; };
 		DA95D5F014DF0B1E008D1B94 /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; };
 		DAA141191922FED80032B392 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
 		DAA1411C1922FF020032B392 /* PearlTween.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PearlTween.m; sourceTree = "<group>"; };
@@ -1551,6 +1553,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DA95B50C1C476B6A0067F5EF /* LocalAuthentication.framework in Frameworks */,
 				DA2C3D651BD9612F001137B3 /* libz.tbd in Frameworks */,
 				DA2C3D631BD96126001137B3 /* libc++.tbd in Frameworks */,
 				DAA1761B19D86D0D0044227B /* libAttributedMarkdown.a in Frameworks */,
@@ -1764,6 +1767,7 @@
 		DA5BFA47147E415C00F98B1E /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				DA95B50B1C476B6A0067F5EF /* LocalAuthentication.framework */,
 				DA2C3D641BD9612F001137B3 /* libz.tbd */,
 				DA2C3D621BD96126001137B3 /* libc++.tbd */,
 				DA2C3D601BD95EEE001137B3 /* Fabric.framework */,
@@ -1791,9 +1795,9 @@
 			isa = PBXGroup;
 			children = (
 				DA5E5C6417248959003798D8 /* include */,
-				DA72BD7719C137D500E6ACFE /* libopensslcrypto-ios-dev.a */,
+				DA7F2C5E1C48B70D00404A26 /* libopensslcrypto-ios-sim.a */,
 				DAE8E65119867AB500416A0F /* libopensslcrypto-ios.a */,
-				DA2C3D5E1BD95DEF001137B3 /* libscryptenc-ios-dev.a */,
+				DA7F2C5F1C48B70D00404A26 /* libscryptenc-ios-sim.a */,
 				DAFFC63E17EDDA7C007BB020 /* libscryptenc-ios.a */,
 			);
 			path = lib;
@@ -2559,7 +2563,7 @@
 			isa = PBXGroup;
 			children = (
 				DABD3BD71711E2DC00CF925C /* iOS */,
-				DA32D00119CF4735004F3F0E /* MasterPassword.xcdatamodeld */,
+				DA95B5101C477DB50067F5EF /* MasterPassword.xcdatamodeld */,
 				DABD3BA01711E2DC00CF925C /* MPAlgorithm.h */,
 				DABD3BA11711E2DC00CF925C /* MPAlgorithm.m */,
 				DABD3BA21711E2DC00CF925C /* MPAlgorithmV0.h */,
@@ -2808,35 +2812,34 @@
 		DAFE45D715039823003ABA7C /* Pearl */ = {
 			isa = PBXGroup;
 			children = (
-				DACE2F6319BA6A0A0010F92E /* PearlProfiler.m */,
-				DACE2F6419BA6A0A0010F92E /* PearlProfiler.h */,
-				DAA1411C1922FF020032B392 /* PearlTween.m */,
-				DAA1411D1922FF020032B392 /* PearlTween.h */,
 				DAA1411E1922FF020032B392 /* include */,
-				DAF4EF4E190A81E400023C90 /* NSManagedObject+Pearl.m */,
-				DAF4EF4F190A81E400023C90 /* NSManagedObject+Pearl.h */,
-				DA2CA4D918D28859007798F8 /* NSArray+Pearl.m */,
-				DA2CA4DA18D28859007798F8 /* NSArray+Pearl.h */,
-				DA2CA4DB18D28859007798F8 /* NSTimer+PearlBlock.m */,
-				DA2CA4DC18D28859007798F8 /* NSTimer+PearlBlock.h */,
-				DA3509FC15F101A500C14A8E /* PearlQueue.h */,
-				DA3509FD15F101A500C14A8E /* PearlQueue.m */,
-				93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */,
-				93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */,
 				93D396D04E57792A54D437AC /* NSArray+Indexing.h */,
 				93D39067C0AFDC581794E2B8 /* NSArray+Indexing.m */,
+				DA2CA4DA18D28859007798F8 /* NSArray+Pearl.h */,
+				DA2CA4D918D28859007798F8 /* NSArray+Pearl.m */,
 				DAFE4A63150399FF003ABA93 /* NSDateFormatter+RFC3339.h */,
 				DAFE4A63150399FF003ABA91 /* NSDateFormatter+RFC3339.m */,
-				DAFE4A63150399FF003ABA87 /* NSObject+PearlKVO.h */,
-				DAFE4A63150399FF003ABA85 /* NSObject+PearlKVO.m */,
-				DA30E9CB15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h */,
-				DA30E9CC15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m */,
+				93D393B97158D7BE9332EA53 /* NSDictionary+Indexing.h */,
+				93D39AA1EE2E1E7B81372240 /* NSDictionary+Indexing.m */,
+				93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */,
+				93D39F9106F2CCFB94283188 /* NSError+PearlFullDescription.m */,
+				DAF4EF4F190A81E400023C90 /* NSManagedObject+Pearl.h */,
+				DAF4EF4E190A81E400023C90 /* NSManagedObject+Pearl.m */,
+				DA95B50D1C4776F00067F5EF /* NSMutableSet+Pearl.h */,
+				DA95B50E1C4776F00067F5EF /* NSMutableSet+Pearl.m */,
+				93D391AA32F24290C424438E /* NSNotificationCenter+PearlEasyCleanup.h */,
 				DAFE45D815039823003ABA7C /* NSObject+PearlExport.h */,
 				DAFE45D915039823003ABA7C /* NSObject+PearlExport.m */,
+				DAFE4A63150399FF003ABA87 /* NSObject+PearlKVO.h */,
+				DAFE4A63150399FF003ABA85 /* NSObject+PearlKVO.m */,
+				93D397F4BAFFF7CF3F1B21A4 /* NSPersistentStore+PearlMigration.h */,
+				93D399C2F3D48E57C4803BDC /* NSPersistentStore+PearlMigration.m */,
 				DAFE45DA15039823003ABA7C /* NSString+PearlNSArrayFormat.h */,
 				DAFE45DB15039823003ABA7C /* NSString+PearlNSArrayFormat.m */,
 				DAFE45DC15039823003ABA7C /* NSString+PearlSEL.h */,
 				DAFE45DD15039823003ABA7C /* NSString+PearlSEL.m */,
+				DA2CA4DC18D28859007798F8 /* NSTimer+PearlBlock.h */,
+				DA2CA4DB18D28859007798F8 /* NSTimer+PearlBlock.m */,
 				DAFE45DE15039823003ABA7C /* Pearl.h */,
 				DA30E9CD15722ECA00A68B4C /* Pearl.m */,
 				DAFE45DF15039823003ABA7C /* PearlAbstractStrings.h */,
@@ -2857,18 +2860,19 @@
 				DAFE45EE15039823003ABA7C /* PearlMathUtils.m */,
 				DAFE45EF15039823003ABA7C /* PearlObjectUtils.h */,
 				DAFE45F015039823003ABA7C /* PearlObjectUtils.m */,
+				DACE2F6419BA6A0A0010F92E /* PearlProfiler.h */,
+				DACE2F6319BA6A0A0010F92E /* PearlProfiler.m */,
+				DA3509FC15F101A500C14A8E /* PearlQueue.h */,
+				DA3509FD15F101A500C14A8E /* PearlQueue.m */,
 				DAFE45F115039823003ABA7C /* PearlResettable.h */,
 				DAFE45F215039823003ABA7C /* PearlStrings.h */,
 				DAFE45F315039823003ABA7C /* PearlStrings.m */,
 				DAFE45F415039823003ABA7C /* PearlStringUtils.h */,
 				DAFE45F515039823003ABA7C /* PearlStringUtils.m */,
+				DAA1411D1922FF020032B392 /* PearlTween.h */,
+				DAA1411C1922FF020032B392 /* PearlTween.m */,
 				DAFE45F815039823003ABA7C /* README */,
 				DAFE45F915039823003ABA7C /* Resources */,
-				93D39F9106F2CCFB94283188 /* NSError+PearlFullDescription.m */,
-				93D398C95847261903D781D3 /* NSError+PearlFullDescription.h */,
-				93D391AA32F24290C424438E /* NSNotificationCenter+PearlEasyCleanup.h */,
-				93D399C2F3D48E57C4803BDC /* NSPersistentStore+PearlMigration.m */,
-				93D397F4BAFFF7CF3F1B21A4 /* NSPersistentStore+PearlMigration.h */,
 			);
 			path = Pearl;
 			sourceTree = "<group>";
@@ -2903,45 +2907,23 @@
 		DAFE460715039823003ABA7C /* Pearl-UIKit */ = {
 			isa = PBXGroup;
 			children = (
-				DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */,
-				DA32D01919D046E1004F3F0E /* PearlFixedTableView.h */,
-				DAE2726119CE9CB3007C5262 /* UITableViewCell+PearlDeque.m */,
-				DAE2726219CE9CB3007C5262 /* UITableViewCell+PearlDeque.h */,
-				DAEFB01C19BCBD9E00525079 /* UIView+LayoutGone.m */,
-				DAEFB01D19BCBD9E00525079 /* UIView+LayoutGone.h */,
-				DACE2F6719BA6A2A0010F92E /* UIView+FontScale.m */,
-				DACE2F6819BA6A2A0010F92E /* PearlMutableStaticTableViewController.m */,
-				DACE2F6919BA6A2A0010F92E /* PearlMutableStaticTableViewController.h */,
-				DACE2F6A19BA6A2A0010F92E /* UIView+FontScale.h */,
-				DA250A13195665A100AC23F1 /* UITableView+PearlReloadFromArray.m */,
-				DA250A14195665A100AC23F1 /* UITableView+PearlReloadFromArray.h */,
-				DA250A15195665A100AC23F1 /* UICollectionReusableView+PearlDequeue.m */,
-				DA250A16195665A100AC23F1 /* UICollectionReusableView+PearlDequeue.h */,
-				DAEC85B118E3DD9A007FC0DF /* UIView+Touches.m */,
-				DAEC85B218E3DD9A007FC0DF /* PearlUINavigationBar.m */,
-				DAEC85B318E3DD9A007FC0DF /* PearlUINavigationBar.h */,
-				DAEC85B418E3DD9A007FC0DF /* UIView+Touches.h */,
-				DA2CA4E518D2AC10007798F8 /* NSLayoutConstraint+PearlUIKit.m */,
 				DA2CA4E218D28866007798F8 /* NSLayoutConstraint+PearlUIKit.h */,
-				93D39F7C9F47BF6387FBC5C3 /* PearlEMail.h */,
-				93D393BB973253D4BAAC84AA /* PearlEMail.m */,
-				DAFE4A63150399FF003ABA8F /* UIScrollView+PearlFlashingIndicators.h */,
-				DAFE4A63150399FF003ABA8D /* UIScrollView+PearlFlashingIndicators.m */,
-				DAFE4A63150399FF003ABA8B /* UIControl+PearlSelect.h */,
-				DAFE4A63150399FF003ABA89 /* UIControl+PearlSelect.m */,
-				DAFE4A63150399FF003ABA83 /* UIControl+PearlBlocks.h */,
-				DAFE4A63150399FF003ABA81 /* UIControl+PearlBlocks.m */,
+				DA2CA4E518D2AC10007798F8 /* NSLayoutConstraint+PearlUIKit.m */,
 				DAFE460815039823003ABA7C /* Pearl-UIKit-Dependencies.h */,
 				DAFE460915039823003ABA7C /* Pearl-UIKit.h */,
 				DA30E9D315722EF400A68B4C /* Pearl-UIKit.m */,
 				DAFE460A15039823003ABA7C /* PearlAlert.h */,
 				DAFE460B15039823003ABA7C /* PearlAlert.m */,
-				DAFE4A60150399FF003ABA7C /* PearlAppDelegate.m */,
 				DAFE4A61150399FF003ABA7C /* PearlAppDelegate.h */,
+				DAFE4A60150399FF003ABA7C /* PearlAppDelegate.m */,
 				DAFE460C15039823003ABA7C /* PearlArrayTVC.h */,
 				DAFE460D15039823003ABA7C /* PearlArrayTVC.m */,
 				DAFE460E15039823003ABA7C /* PearlBoxView.h */,
 				DAFE460F15039823003ABA7C /* PearlBoxView.m */,
+				93D39F7C9F47BF6387FBC5C3 /* PearlEMail.h */,
+				93D393BB973253D4BAAC84AA /* PearlEMail.m */,
+				DA32D01919D046E1004F3F0E /* PearlFixedTableView.h */,
+				DA32D01819D046E1004F3F0E /* PearlFixedTableView.m */,
 				DAFE461015039823003ABA7C /* PearlGradientView.h */,
 				DAFE461115039823003ABA7C /* PearlGradientView.m */,
 				DAFE461215039823003ABA7C /* PearlLayout.h */,
@@ -2950,12 +2932,24 @@
 				DAFE461515039823003ABA7C /* PearlLayoutView.m */,
 				DAFE461615039823003ABA7C /* PearlMessageView.h */,
 				DAFE461715039823003ABA7C /* PearlMessageView.m */,
+				DACE2F6919BA6A2A0010F92E /* PearlMutableStaticTableViewController.h */,
+				DACE2F6819BA6A2A0010F92E /* PearlMutableStaticTableViewController.m */,
+				93D398567FD02DB2647B8CF3 /* PearlNavigationController.h */,
+				93D3956915634581E737B38C /* PearlNavigationController.m */,
+				93D3942A356B639724157982 /* PearlOverlay.h */,
+				93D390FADEB325D8D54A957D /* PearlOverlay.m */,
 				DAFE461815039823003ABA7C /* PearlRootViewController.h */,
 				DAFE461915039823003ABA7C /* PearlRootViewController.m */,
 				DAFE461A15039823003ABA7C /* PearlSheet.h */,
 				DAFE461B15039823003ABA7C /* PearlSheet.m */,
+				93D39A4759186F6D2D34AA6B /* PearlSizedTextView.h */,
+				93D39156E806BB78E04F78B9 /* PearlSizedTextView.m */,
+				93D39B1D8177A86C5B9EDDE3 /* PearlUICollectionView.h */,
+				93D39D8A953779B35403AF6E /* PearlUICollectionView.m */,
 				DAFE461C15039823003ABA7C /* PearlUIDebug.h */,
 				DAFE461D15039823003ABA7C /* PearlUIDebug.m */,
+				DAEC85B318E3DD9A007FC0DF /* PearlUINavigationBar.h */,
+				DAEC85B218E3DD9A007FC0DF /* PearlUINavigationBar.m */,
 				DAFE461E15039823003ABA7C /* PearlUIUtils.h */,
 				DAFE461F15039823003ABA7C /* PearlUIUtils.m */,
 				DAFE462015039823003ABA7C /* PearlValidatingTextField.h */,
@@ -2964,24 +2958,34 @@
 				DAFE462315039823003ABA7C /* PearlWebViewController.m */,
 				DAFE462415039823003ABA7C /* README */,
 				DAFE462515039823003ABA7C /* Resources */,
+				DA250A16195665A100AC23F1 /* UICollectionReusableView+PearlDequeue.h */,
+				DA250A15195665A100AC23F1 /* UICollectionReusableView+PearlDequeue.m */,
+				93D39246FC21C6E63E35D615 /* UICollectionView+PearlReloadFromArray.h */,
+				93D3908DF8EABBD952065DC0 /* UICollectionView+PearlReloadFromArray.m */,
+				DAFE4A63150399FF003ABA83 /* UIControl+PearlBlocks.h */,
+				DAFE4A63150399FF003ABA81 /* UIControl+PearlBlocks.m */,
+				DAFE4A63150399FF003ABA8B /* UIControl+PearlSelect.h */,
+				DAFE4A63150399FF003ABA89 /* UIControl+PearlSelect.m */,
 				DAFE4A1115039824003ABA7C /* UIImage+PearlScaling.h */,
 				DAFE4A1215039824003ABA7C /* UIImage+PearlScaling.m */,
-				93D390FADEB325D8D54A957D /* PearlOverlay.m */,
-				93D3942A356B639724157982 /* PearlOverlay.h */,
-				93D3956915634581E737B38C /* PearlNavigationController.m */,
-				93D398567FD02DB2647B8CF3 /* PearlNavigationController.h */,
-				93D390FB3110DCCE68E600DC /* UIScrollView+PearlAdjustInsets.m */,
-				93D39DE2CB351D4E3789462B /* UIScrollView+PearlAdjustInsets.h */,
-				93D39D8A953779B35403AF6E /* PearlUICollectionView.m */,
-				93D39B1D8177A86C5B9EDDE3 /* PearlUICollectionView.h */,
-				93D39A1DDFA09AE2E14D26DC /* UIResponder+PearlFirstResponder.m */,
 				93D394482BB07F90E8FD1314 /* UIResponder+PearlFirstResponder.h */,
-				93D39156E806BB78E04F78B9 /* PearlSizedTextView.m */,
-				93D39A4759186F6D2D34AA6B /* PearlSizedTextView.h */,
-				93D3977321EB249981821AB0 /* UITextView+PearlAttributes.m */,
+				93D39A1DDFA09AE2E14D26DC /* UIResponder+PearlFirstResponder.m */,
+				93D39DE2CB351D4E3789462B /* UIScrollView+PearlAdjustInsets.h */,
+				93D390FB3110DCCE68E600DC /* UIScrollView+PearlAdjustInsets.m */,
+				DAFE4A63150399FF003ABA8F /* UIScrollView+PearlFlashingIndicators.h */,
+				DAFE4A63150399FF003ABA8D /* UIScrollView+PearlFlashingIndicators.m */,
+				DA250A14195665A100AC23F1 /* UITableView+PearlReloadFromArray.h */,
+				DA250A13195665A100AC23F1 /* UITableView+PearlReloadFromArray.m */,
+				DAE2726219CE9CB3007C5262 /* UITableViewCell+PearlDeque.h */,
+				DAE2726119CE9CB3007C5262 /* UITableViewCell+PearlDeque.m */,
 				93D39AA10CD00D05937671B1 /* UITextView+PearlAttributes.h */,
-				93D3908DF8EABBD952065DC0 /* UICollectionView+PearlReloadFromArray.m */,
-				93D39246FC21C6E63E35D615 /* UICollectionView+PearlReloadFromArray.h */,
+				93D3977321EB249981821AB0 /* UITextView+PearlAttributes.m */,
+				DACE2F6A19BA6A2A0010F92E /* UIView+FontScale.h */,
+				DACE2F6719BA6A2A0010F92E /* UIView+FontScale.m */,
+				DAEFB01D19BCBD9E00525079 /* UIView+LayoutGone.h */,
+				DAEFB01C19BCBD9E00525079 /* UIView+LayoutGone.m */,
+				DAEC85B418E3DD9A007FC0DF /* UIView+Touches.h */,
+				DAEC85B118E3DD9A007FC0DF /* UIView+Touches.m */,
 			);
 			path = "Pearl-UIKit";
 			sourceTree = "<group>";
@@ -3067,7 +3071,6 @@
 				DAFE4A5615039824003ABA7C /* PearlWebViewController.h in Headers */,
 				DAFE4A5815039824003ABA7C /* UIImage+PearlScaling.h in Headers */,
 				DAFE4A63150399FF003ABA7C /* PearlAppDelegate.h in Headers */,
-				DA30E9CE15722ECA00A68B4C /* NSBundle+PearlMutableInfo.h in Headers */,
 				DA30E9D715723E6900A68B4C /* PearlLazy.h in Headers */,
 				DAA141211922FF020032B392 /* PearlTween.h in Headers */,
 				DAFE4A63150399FF003ABA84 /* UIControl+PearlBlocks.h in Headers */,
@@ -3646,12 +3649,13 @@
 				93D39392DEDA376F93C6C718 /* MPCell.m in Sources */,
 				93D39A5FF670957C0AF8298D /* MPPasswordCell.m in Sources */,
 				93D398ECD7D1A0DEDDADF516 /* MPEmergencyViewController.m in Sources */,
-				DA32D00819CF4735004F3F0E /* MasterPassword.xcdatamodeld in Sources */,
+				DA95B50F1C4776F00067F5EF /* NSMutableSet+Pearl.m in Sources */,
 				93D394B5036C882B33C71872 /* MPPasswordsSegue.m in Sources */,
 				93D39673DDC085BE72C34D7C /* MPPopdownSegue.m in Sources */,
 				93D39BA1EA3CAAC8A220B4A6 /* MPAppSettingsViewController.m in Sources */,
 				93D396D8B67DA6522CDBA142 /* MPCoachmarkViewController.m in Sources */,
 				DAADBFE01A68763B00F7A756 /* mpw-algorithm.c in Sources */,
+				DA95B5191C477DB50067F5EF /* MasterPassword.xcdatamodeld in Sources */,
 				93D39EAA4D064193074D3021 /* MPFixable.m in Sources */,
 				DA32CFF119CF1C8F004F3F0E /* MPStoredSiteEntity.m in Sources */,
 				93D394982CBD25D46692DD7C /* MPWebViewController.m in Sources */,
@@ -3743,7 +3747,6 @@
 				DACE2F6C19BA6A2A0010F92E /* PearlMutableStaticTableViewController.m in Sources */,
 				DAFE4A5915039824003ABA7C /* UIImage+PearlScaling.m in Sources */,
 				DAFE4A62150399FF003ABA7C /* PearlAppDelegate.m in Sources */,
-				DA30E9CF15722ECA00A68B4C /* NSBundle+PearlMutableInfo.m in Sources */,
 				DA30E9D015722ECA00A68B4C /* Pearl.m in Sources */,
 				DA30E9D215722EE500A68B4C /* Pearl-Crypto.m in Sources */,
 				DA30E9D415722EF400A68B4C /* Pearl-UIKit.m in Sources */,
@@ -4019,6 +4022,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Maarten Billemont (DWGU95U4ZD)";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../../../External/iOS\"",
@@ -4042,12 +4046,10 @@
 				);
 				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
 					"$(inherited)",
-					"-lscryptenc-ios-dev",
-					"-lopensslcrypto-ios-dev",
+					"-lscryptenc-ios-sim",
+					"-lopensslcrypto-ios-sim",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword;
-				PROVISIONING_PROFILE = "";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "3251b7d3-04df-4c8e-a410-d020ffc92d10";
 				SKIP_INSTALL = NO;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -4059,6 +4061,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Maarten Billemont (HL3Q45LX9N)";
 				COPY_PHASE_STRIP = YES;
 				EXCLUDED_SOURCE_FILE_NAMES = libDCIntrospect.a;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4080,12 +4083,10 @@
 				);
 				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
 					"$(inherited)",
-					"-lscryptenc-ios-dev",
-					"-lopensslcrypto-ios-dev",
+					"-lscryptenc-ios-sim",
+					"-lopensslcrypto-ios-sim",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword;
-				PROVISIONING_PROFILE = "";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "59b587d0-3ef3-4691-9f12-c48f7f283002";
 				SKIP_INSTALL = NO;
 				STRIP_INSTALLED_PRODUCT = YES;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -4183,6 +4184,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Maarten Billemont (HL3Q45LX9N)";
 				COPY_PHASE_STRIP = YES;
 				EXCLUDED_SOURCE_FILE_NAMES = libDCIntrospect.a;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -4204,12 +4206,10 @@
 				);
 				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
 					"$(inherited)",
-					"-lscryptenc-ios-dev",
-					"-lopensslcrypto-ios-dev",
+					"-lscryptenc-ios-sim",
+					"-lopensslcrypto-ios-sim",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.lyndir.lhunath.MasterPassword;
-				PROVISIONING_PROFILE = "";
-				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "a1d8cfc8-b8db-4544-af34-28cc75e46c40";
 				SKIP_INSTALL = NO;
 				STRIP_INSTALLED_PRODUCT = YES;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -4458,18 +4458,19 @@
 /* End XCConfigurationList section */

 /* Begin XCVersionGroup section */
-		DA32D00119CF4735004F3F0E /* MasterPassword.xcdatamodeld */ = {
+		DA95B5101C477DB50067F5EF /* MasterPassword.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
-				DA8495271A9146E600B3053D /* MasterPassword 7.xcdatamodel */,
-				DA32D00219CF4735004F3F0E /* MasterPassword 1.xcdatamodel */,
-				DA32D00319CF4735004F3F0E /* MasterPassword 2.xcdatamodel */,
-				DA32D00419CF4735004F3F0E /* MasterPassword 3.xcdatamodel */,
-				DA32D00519CF4735004F3F0E /* MasterPassword 4.xcdatamodel */,
-				DA32D00619CF4735004F3F0E /* MasterPassword 5.xcdatamodel */,
-				DA32D00719CF4735004F3F0E /* MasterPassword 6.xcdatamodel */,
+				DA95B5111C477DB50067F5EF /* MasterPassword 1.xcdatamodel */,
+				DA95B5121C477DB50067F5EF /* MasterPassword 2.xcdatamodel */,
+				DA95B5131C477DB50067F5EF /* MasterPassword 3.xcdatamodel */,
+				DA95B5141C477DB50067F5EF /* MasterPassword 4.xcdatamodel */,
+				DA95B5151C477DB50067F5EF /* MasterPassword 5.xcdatamodel */,
+				DA95B5161C477DB50067F5EF /* MasterPassword 6.xcdatamodel */,
+				DA95B5171C477DB50067F5EF /* MasterPassword 7.xcdatamodel */,
+				DA95B5181C477DB50067F5EF /* MasterPassword 8.xcdatamodel */,
 			);
-			currentVersion = DA8495271A9146E600B3053D /* MasterPassword 7.xcdatamodel */;
+			currentVersion = DA95B5181C477DB50067F5EF /* MasterPassword 8.xcdatamodel */;
 			path = MasterPassword.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;
--- a/MasterPassword/ObjC/iOS/Storyboard.storyboard
+++ b/MasterPassword/ObjC/iOS/Storyboard.storyboard
Author	SHA1	Message	Date
Maarten Billemont	7c97cd7a6d	Crashlytics for Mac update.	2016-01-27 21:40:09 -05:00
Maarten Billemont	0aa47cc3f4	Mac build fixes and Fabric integration.	2016-01-27 21:38:36 -05:00
Maarten Billemont	39b380b938	Add TouchID to storeVersions and update crypto libs for bitcode.	2016-01-15 00:19:07 -05:00
Maarten Billemont	e6fdd8859e	Update copyright.	2016-01-14 11:24:27 -05:00
Maarten Billemont	de70e871a2	Fixes to TouchID in-app checks.	2016-01-14 11:22:15 -05:00
Maarten Billemont	225e932fe7	Enable In-App purchase of TouchID feature and improved auto-height calculation of preferences and store table cells.	2016-01-14 10:50:03 -05:00
Maarten Billemont	61b4ea4525	Finish TouchID support.	2016-01-14 09:58:04 -05:00
Maarten Billemont	a42edec918	TouchID integration and fixes to PearlLogger integration into mpw C code.	2016-01-14 02:14:36 -05:00
Maarten Billemont	360b20d06f	Make output verbosity configurable from the CLI and standardize options.	2016-01-04 14:52:05 -05:00
Maarten Billemont	6bc8fa1a6a	[maven-release-plugin] rollback changes from release preparation of 2.3.1	2015-12-24 23:32:47 -05:00