diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3e538b600..7e40dfca2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/CHANGELOG b/CHANGELOG
index e3b714e24..8b9355fce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,8 @@
+KeePassDroid (2.0.6.2)
  * Fix launch immediately from nfd
  * Updated German translations from MaDill
  * Add Portugese (Portugal) translations from YSmhXQDd6Z
  * Add Lithuanian translations from zygimantus
- * Support keyfile in View intent
 
 KeePassDroid (2.0.6.1)
  * Fix crash in URI to file mapping
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e9cf65d86..8c8ab0777 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -11,7 +11,6 @@ josefwells
 Nicholas FitzRoy-Dale - auto launch intents
 yulin2 - responsiveness improvements
 Tadashi Saito
-nfd - Keyfile in view intent fixes
 
 
 
diff --git a/app/app.iml b/app/app.iml
index 32570afa7..c68511c7a 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -74,13 +74,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/flavor1/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/flavor1/renderscript" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/flavor1/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFlavor1/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFlavor1/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFlavor1/assets" type="java-test-resource" />
@@ -88,6 +81,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testFlavor1/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFlavor1/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testFlavor1/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavor1/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
diff --git a/app/build.gradle b/app/build.gradle
index b7c64b230..0c5e72585 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ model {
             applicationId = "com.android.keepass"
             minSdkVersion.apiLevel = 3
             targetSdkVersion.apiLevel = 12
-            versionCode = 151
-            versionName = "2.0.6.1"
+            versionCode = 152
+            versionName = "2.0.6.2"
 
             testApplicationId = "com.keepassdroid.tests"
             testInstrumentationRunner = "android.test.InstrumentationTestRunner"