diff --git a/AndorsTrail/AndroidManifest.xml b/AndorsTrail/AndroidManifest.xml
index d577d58cf..3d6a62f45 100644
--- a/AndorsTrail/AndroidManifest.xml
+++ b/AndorsTrail/AndroidManifest.xml
@@ -3,7 +3,7 @@
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="34"
+	android:versionCode="36"
 	android:versionName="0.7.0dev"
 	android:installLocation="auto"
 	>
diff --git a/AndorsTrail/res/xml/gapfiller2.tmx b/AndorsTrail/res/xml/gapfiller2.tmx
index 758015b1d..52e4bca7e 100644
--- a/AndorsTrail/res/xml/gapfiller2.tmx
+++ b/AndorsTrail/res/xml/gapfiller2.tmx
@@ -130,21 +130,20 @@
  </layer>
  <layer name="Objects" width="23" height="26">
   <data encoding="base64" compression="zlib">
-   eJyVVUGOwjAMTMVyK2jDE/jfcuQJnDjzr72i7gsoEtLeVloJmXaoO7GTdC4Qx3bGE8cNYUDXhhn+aA00MYS4GRfR9inCiGvIdmsHv5e9cM6bTyY/1wd4dWp7EqvyM2/guKnkEQ0e0cjr2CweR9ZD+fx8TueBC87uHS2A27jPNUhe5q/9Ezi8k3v0wFoYa8Ej08M6pnPqt3omOveKvKJDSUfGdYG/5qTv0uLixdXAvbtSrsyb9d7KUuTuYCnANanX6dFZ71TUylq913H+HgHuha5NufTObOrVe+a8Eqd9d1u1yTPImjVBaWTs6be736a1IB9s2bfOen8M/0/r4ffchHBf2Tx6Qy+B17PQ6bKebP+rNB74bSf7lbV3evKQ6S1wq5oBRr/xTIaumrfseTOP+wR1iN9XxXdVoP2sfi/NddnnPtfgO1gyL+cHpXnlG/FNc5Q1yQHfGNbqCdmnT98=
+   eJyVVUGOwjAMTMVyKxXZJ/A/OHLkBXyOa9V9AV0JaW8rIa28Zag7sZN0LhDHdsYTxw1hwtCGBX5pDTQxhLh7LaLtU4QR15Dt3k5+//bCOW8+mfxcH+DVqe1JrMrPvIHzrpJHNHhEI69js3icWQ/l87WfzwMXnD06WgD31z7XIHmZv/ZP4PBO7tEDa2GsBY9MD+uYwanf6pno3Cvyig4lHRn9Cn/NSd+lxcWLq4F7d6VcmTfrvZW1yN3BWoBrUq/To4veqaiVtXqv4/I9AtwLQ5tyGZ3ZNKr3zHklTvt+dmqTZ5A1a4LSyNjTb/fQpbUgH2zZt856f0z/T9vp99qE8L2xeYyGXgKvZ6HTZTvbnps0HvhpZ3vP2js9ecr0FrhVzQCj33gmQ1fNW/a8mcd9gjrE71jxXRVoP6vfS3Nd9rnPNfgO1szL5UFpXvlG3GiOsiY54BvDWv0BYgdPrw==
   </data>
  </layer>
  <layer name="Above" width="23" height="26">
   <data encoding="base64" compression="zlib">
-   eJzVVbsOwzAIzNJskbK0v5Y/yN/mX9JK7Rx5sIQwd4DjpTdiH48D42myca7g4A/xJrVE6ix3mI/sPQuFV/nHIO1ZbV6ukqvvRWdD8li8emb57dXzLndUTN1LWauVn6ct0xDZkbYR/6gnd/eDni9PFw+V4+Ul/UfjHAPqjfjV+XwWzM2834rvo7X9hA3No6dTOX/Orf0187lkcSWsfbgl+Nm4O+l3Zg4iukXs6D/o2R8M+g2i3ls7oveP9f4EhOib9HpgxenpseZc8E1nQw==
+   eJzVVTEOwzAIzJJskbKkX+sP8of2j/lLWqmdKw9IiHAHdryUEfsOODAeBt+OBRz8ob1ILZk6yx3GUXvPs4IT/N5Je1ZblKvG2nvZ2dA4Fk/OPN5WPa9ie8W0vdS1evlF2jINkR9pm+FHPbm6H+x8RbpEJpgoL82fjbN3qDfDa/N5zxhb837FPuPZ91U+NI+RTuV8nc7+28TnksXV5u3DewU+E/epdNhIv2vmQPgfju42PvOj/6BlfzCzbxD13tsRrX8s4o84s28ymg0vTkuPLeYH0OxpQQ==
   </data>
  </layer>
  <layer name="Walkable" width="23" height="26">
   <data encoding="base64" compression="zlib">
-   eJy1k8sRgDAIRFOCTdl/S94d2S8yk4MR3i6I58xxX9+HvX/nuVyFj8LJ/TPf6bG5Qz7c2U21jMu8urVKT+xZOUls81K+O7t0Hun/r/jfqm246n63zNajs2MNl+ls+W721P12jI90p1pXV+2b1SV81A/SUX2zcGaraDIum0Gap+7OA/q3aus=
+   eJy1k8sRwCAIRC3BptJ/S94dYX+EGQ8x7GMhZK06vv0+6P2dp3IZfhdK7p/5So/JXedDnV2lRVzkVdUyPaFn5jgxzXP56uzcebj/P+N/Sptw2f1OmalHZccSLqoz5TvZU/XbTfGTumzfSOfwu366OqxvFMpsmZqIi2bg5lXa++4Av0ZrQA==
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
-  <object name="sign_whitecabin" type="sign" x="416" y="608" width="32" height="32"/>
   <object name="south2" type="mapchange" x="576" y="800" width="32" height="32">
    <properties>
     <property name="map" value="wild9"/>
diff --git a/AndorsTrail/res/xml/wild3.tmx b/AndorsTrail/res/xml/wild3.tmx
index c4c2c3a37..69da91b52 100644
--- a/AndorsTrail/res/xml/wild3.tmx
+++ b/AndorsTrail/res/xml/wild3.tmx
@@ -138,9 +138,9 @@
    eJxjYCANfBTAziZV70ACUtzxQYC27qa1+dQEZWyoboW5HZsfiPUXNf0Pch8lgFS3EKueXP+hm/8BiznIai6h0ZS4B6TmEVTdIyrED6MghA4XgGAYICYMcakBmZOGZh6DIHYzCIXJJSRz0pDUPuHBrwcXAIWZOwemmvto5hHjLmQ1j0gMO2KAIi8DgxIQg8KOEUf44QIApRI1hA==
   </data>
  </layer>
- <layer name="Walkable" width="20" height="20" visible="0">
+ <layer name="Walkable" width="20" height="20">
   <data encoding="base64" compression="zlib">
-   eJytU9sNACEMcgSXcv+V7usSQyrQB0k/1Eqh1rPXOiR+sBw3EPd+lFPhZFCesmB9cjXgWRfY0ylUe+TwYg02C0pf9j2Uto7nSEu33qQf1WdnjirvMuEh4nP/Mrsb1XlxuPo6nMqbWjt8GX7EB3LILig=
+   eJytVEkOACEM8gl+yv9/aU6TGFKBLiQ9uIRSWj17rUPiB7vjBuLej+5UOBlUTVkwn1wNeNYFejqFqkcOL+Zgs6D0ZfuhtHVqjrR0803Wo3x25qjSl6k3F/FlPXT+uxeHq6/DqWpTa4cvw4/4AAjbLn0=
   </data>
  </layer>
  <objectgroup name="Mapevents" width="0" height="0">
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index 00a9ee139..bd2072d53 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -17,7 +17,7 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
 	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = true;
-	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES;
+	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS;
 	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 36;
 	public static final String CURRENT_VERSION_DISPLAY = "0.7.0dev";