diff --git a/.gitmodules b/.gitmodules
index 9681f30f..b6f6ca81 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,4 +15,4 @@
 	url = git://github.com/lhunath/RHStatusItemView.git
 [submodule "External/DCIntrospect"]
 	path = External/DCIntrospect
-	url = https://github.com/domesticcatsoftware/DCIntrospect.git
+	url = https://github.com/lhunath/DCIntrospect.git
diff --git a/External/Crashlytics.framework/run b/External/Crashlytics.framework/run
old mode 100644
new mode 100755
diff --git a/External/DCIntrospect b/External/DCIntrospect
index 9555122e..3aa31226 160000
--- a/External/DCIntrospect
+++ b/External/DCIntrospect
@@ -1 +1 @@
-Subproject commit 9555122e94e0f61375e5b375b906b81d6d5b1e6e
+Subproject commit 3aa3122645afa96c2354124b96bb714de9ad2d69
diff --git a/External/UbiquityStoreManager b/External/UbiquityStoreManager
index 6707cb36..0243b92e 160000
--- a/External/UbiquityStoreManager
+++ b/External/UbiquityStoreManager
@@ -1 +1 @@
-Subproject commit 6707cb36233c9f6b7c2a71c8aa186ccf11bd318f
+Subproject commit 0243b92ebaaebcabe5aff78428471951e22fae1f
diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme
index 188d8b26..d88b8e64 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme	
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (App Store).xcscheme	
@@ -28,26 +28,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       buildConfiguration = "AppStore-iOS">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DAE1EF3517ED112700BC0086"
-               BuildableName = "DCIntrospectTests.xctest"
-               BlueprintName = "DCIntrospectTests"
-               ReferencedContainer = "container:MasterPassword-iOS.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DAFFC5E217ED14AB007BB020"
-               BuildableName = "testTests.xctest"
-               BlueprintName = "testTests"
-               ReferencedContainer = "container:MasterPassword-iOS.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
diff --git a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme
index 37fa0dc3..9cc7e2ed 100644
--- a/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme	
+++ b/MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj/xcshareddata/xcschemes/MasterPassword iOS (Development).xcscheme	
@@ -28,26 +28,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES"
       buildConfiguration = "Debug-iOS">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DAE1EF3517ED112700BC0086"
-               BuildableName = "DCIntrospectTests.xctest"
-               BlueprintName = "DCIntrospectTests"
-               ReferencedContainer = "container:MasterPassword-iOS.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "DAFFC5E217ED14AB007BB020"
-               BuildableName = "testTests.xctest"
-               BlueprintName = "testTests"
-               ReferencedContainer = "container:MasterPassword-iOS.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference