diff --git a/app/app.iml b/app/app.iml
index 02c6fc8..1c81077 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -15,7 +15,7 @@
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest-debug.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
diff --git a/app/build.gradle b/app/build.gradle
index 3583078..9fdd221 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -69,8 +69,22 @@ android {
 
         }
         */
-        androidTest.setRoot('src/tests')
+        debug {
+            main.manifest.srcFile "src/main/AndroidManifest-debug.xml"
+        }
+        androidTest.setRoot("src/tests")
     }
+
+	/*
+	signingConfigs {
+		release {
+			storeFile file('HelloConfig.keystore')
+			keyAlias 'HelloConfig'
+			storePassword 'laser.yams.heady.testy'
+			keyPassword 'fw.stabs.steady.wool'
+		}
+	}
+	*/
 }
 
 //repositories {}
diff --git a/app/src/main/AndroidManifest-debug.xml b/app/src/main/AndroidManifest-debug.xml
new file mode 100644
index 0000000..0a820eb
--- /dev/null
+++ b/app/src/main/AndroidManifest-debug.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="org.vostan.sokoban"
+      android:versionCode="0x00010001"
+      android:versionName="@string/git_version">
+    <uses-sdk android:minSdkVersion="10" 
+			  android:targetSdkVersion="14"/>
+    <application android:label="@string/app_name_debug" 
+				 android:icon="@drawable/icon_debug"
+				 android:name="org.vostan.sokoban.App"
+				 android:theme="@android:style/Theme">
+        <activity	android:name="org.vostan.sokoban.menu.MainActivity"
+					android:label="@string/app_name"
+					android:configChanges="keyboardHidden|orientation"
+					android:screenOrientation="portrait" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity 	android:name="org.vostan.sokoban.play.PlayActivity"
+					android:label="@string/play_activity"
+					android:configChanges="keyboardHidden|orientation"
+					android:screenOrientation="portrait" >
+	        <meta-data
+	            android:name="android.support.PARENT_ACTIVITY"
+	            android:value="org.vostan.sokoban.MainMenu" />
+        </activity>
+    </application>
+</manifest>