diff --git a/External/Crashlytics.framework/Versions/A/Crashlytics b/External/Crashlytics.framework/Versions/A/Crashlytics
index b9883dcb..36430ccc 100644
Binary files a/External/Crashlytics.framework/Versions/A/Crashlytics and b/External/Crashlytics.framework/Versions/A/Crashlytics differ
diff --git a/External/Crashlytics.framework/Versions/A/Resources/Info.plist b/External/Crashlytics.framework/Versions/A/Resources/Info.plist
index 89eacb75..6a6df8e7 100644
--- a/External/Crashlytics.framework/Versions/A/Resources/Info.plist
+++ b/External/Crashlytics.framework/Versions/A/Resources/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BuildMachineOSBuild</key>
-	<string>12C60</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -17,29 +15,15 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.3</string>
+	<string>2.0.7</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0200.03.00</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>10A403</string>
+	<string>0200.07.00</string>
 	<key>DTPlatformName</key>
 	<string>iphoneos</string>
-	<key>DTPlatformVersion</key>
-	<string>6.0</string>
-	<key>DTSDKBuild</key>
-	<string>10A403</string>
-	<key>DTSDKName</key>
-	<string>iphoneos6.0</string>
-	<key>DTXcode</key>
-	<string>0451</string>
-	<key>DTXcodeBuild</key>
-	<string>4G1004</string>
 	<key>MinimumOSVersion</key>
 	<string>4.0</string>
 </dict>
diff --git a/External/Crashlytics.framework/Versions/A/Resources/Runner b/External/Crashlytics.framework/Versions/A/Resources/Runner
deleted file mode 120000
index faa4f129..00000000
--- a/External/Crashlytics.framework/Versions/A/Resources/Runner
+++ /dev/null
@@ -1 +0,0 @@
-../../../run
\ No newline at end of file
diff --git a/External/Crashlytics.framework/Versions/A/Resources/en.lproj/InfoPlist.strings b/External/Crashlytics.framework/Versions/A/Resources/en.lproj/InfoPlist.strings
deleted file mode 100644
index 3967e063..00000000
Binary files a/External/Crashlytics.framework/Versions/A/Resources/en.lproj/InfoPlist.strings and /dev/null differ
diff --git a/External/Crashlytics.framework/Versions/A/Resources/runner.rb b/External/Crashlytics.framework/Versions/A/Resources/runner.rb
deleted file mode 100644
index b6ea201c..00000000
--- a/External/Crashlytics.framework/Versions/A/Resources/runner.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/ruby
-
-#
-#  WARNING: DO NOT MODIFY THIS FILE.
-#
-#  Crashlytics
-#  Crashlytics Version: 1.0.0.1
-#  
-#  Copyright Crashlytics, Inc. 2012. All rights reserved.
-#
-
-require 'pathname'
-
-path = Pathname.new(__FILE__).parent
-`#{path}/../../../run`
\ No newline at end of file
diff --git a/External/Crashlytics.framework/run b/External/Crashlytics.framework/run
index 5eb090e2..2920a270 100755
Binary files a/External/Crashlytics.framework/run and b/External/Crashlytics.framework/run differ
diff --git a/MasterPassword.xcworkspace/contents.xcworkspacedata b/MasterPassword.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000..f5230860
--- /dev/null
+++ b/MasterPassword.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
index fdaa2500..fd6efa06 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/project.pbxproj
@@ -5617,6 +5617,10 @@
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../External\"",
+				);
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
 				SKIP_INSTALL = NO;
@@ -5630,6 +5634,10 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Maarten Billemont";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../External\"",
+				);
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "80887556-4877-47B1-917D-AF2CB11D3E1F";
@@ -5757,6 +5765,10 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Maarten Billemont";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../External\"",
+				);
 				GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
 				INFOPLIST_FILE = "MasterPassword-Info.plist";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "3EF104A5-610A-429E-ACF0-232A2C8A7E1C";