From 83d2a8bde0e8a6d4b745ac300de87b332137a1d9 Mon Sep 17 00:00:00 2001
From: Oskar Wiksten <oskar.wiksten@gmail.com>
Date: Tue, 23 Jul 2013 16:36:26 +0200
Subject: [PATCH] Convert all code spaces to tabs.

* Yay for spaces-vs-tabs flamewar!
* Also removes trailing whitespaces in code
---
 AndorsTrail/res/anim/hidecombatbar.xml        |   2 +-
 AndorsTrail/res/anim/hidetoolbox.xml          |   2 +-
 AndorsTrail/res/anim/scalebeat.xml            |   4 +-
 AndorsTrail/res/anim/scaledown.xml            |   2 +-
 AndorsTrail/res/anim/scaleup.xml              |   2 +-
 AndorsTrail/res/anim/showcombatbar.xml        |   2 +-
 AndorsTrail/res/anim/showtoolbox.xml          |   2 +-
 .../res/drawable/ui_debug_background.xml      |  12 +-
 AndorsTrail/res/drawable/ui_gradientshape.xml |   2 +-
 .../drawable/ui_gradientshape_translucent.xml |   4 +-
 .../res/drawable/ui_headerbackground.xml      |   2 +-
 .../res/drawable/ui_progress_health.xml       |  10 +-
 .../res/drawable/ui_startbackground.xml       |   4 +-
 AndorsTrail/res/drawable/ui_statustext.xml    |  12 +-
 .../res/layout-land/heroinfo_inventory.xml    |  12 +-
 .../res/layout/abilitymodifierview.xml        |  74 +-
 AndorsTrail/res/layout/about.xml              |  10 +-
 AndorsTrail/res/layout/actorconditioninfo.xml |  58 +-
 AndorsTrail/res/layout/bulkselection.xml      | 190 ++--
 AndorsTrail/res/layout/combatlog_row.xml      |  12 +-
 AndorsTrail/res/layout/combatview.xml         |  18 +-
 AndorsTrail/res/layout/conversation.xml       |  24 +-
 AndorsTrail/res/layout/displayworldmap.xml    |  50 +-
 AndorsTrail/res/layout/heroinfo_equipped.xml  |  50 +-
 AndorsTrail/res/layout/heroinfo_inventory.xml |   8 +-
 .../res/layout/heroinfo_skill_list.xml        |  18 +-
 AndorsTrail/res/layout/heroinfo_stats.xml     | 238 ++---
 .../res/layout/heroinfo_stats_gamestats.xml   | 100 +--
 .../res/layout/heroinfo_statsicons.xml        |  54 +-
 AndorsTrail/res/layout/inventoryitemview.xml  |  14 +-
 AndorsTrail/res/layout/itemeffectview.xml     |  32 +-
 .../res/layout/itemeffectview_onuse.xml       |  20 +-
 AndorsTrail/res/layout/iteminfo.xml           |  52 +-
 AndorsTrail/res/layout/levelup.xml            |  20 +-
 AndorsTrail/res/layout/loadsave.xml           |  10 +-
 AndorsTrail/res/layout/main.xml               |  24 +-
 AndorsTrail/res/layout/monsterencounter.xml   |  32 +-
 AndorsTrail/res/layout/monsterinfo.xml        |  48 +-
 AndorsTrail/res/layout/questlog.xml           |   6 +-
 AndorsTrail/res/layout/rangebar.xml           |   8 +-
 AndorsTrail/res/layout/shoplist.xml           |  40 +-
 AndorsTrail/res/layout/skill_info_view.xml    |  48 +-
 .../res/layout/skill_listentry_view.xml       |  26 +-
 AndorsTrail/res/layout/startscreen.xml        |  20 +-
 AndorsTrail/res/layout/statusview.xml         |  26 +-
 AndorsTrail/res/layout/tabbedlayout.xml       |  54 +-
 AndorsTrail/res/layout/toolboxview.xml        |  28 +-
 AndorsTrail/res/layout/traitsinfoview.xml     |   4 +-
 AndorsTrail/res/values-de/strings.xml         | 360 ++++----
 AndorsTrail/res/values-de/strings_about.xml   |   2 +-
 AndorsTrail/res/values-fr/strings.xml         | 834 +++++++++---------
 AndorsTrail/res/values-it/strings.xml         | 552 ++++++------
 AndorsTrail/res/values-iw/strings.xml         |  46 +-
 AndorsTrail/res/values-ja/strings.xml         | 332 +++----
 AndorsTrail/res/values-pl/strings.xml         | 358 ++++----
 AndorsTrail/res/values-pl/strings_about.xml   |   2 +-
 AndorsTrail/res/values-pt-rBR/strings.xml     | 256 +++---
 .../res/values-pt-rBR/strings_about.xml       |   2 +-
 AndorsTrail/res/values-pt/strings.xml         | 278 +++---
 AndorsTrail/res/values-ru/strings.xml         | 424 ++++-----
 .../res/values-v10/ui_listviewstyle.xml       |   8 +-
 AndorsTrail/res/values/arrays.xml             |  56 +-
 AndorsTrail/res/values/authors.xml            |   2 +-
 AndorsTrail/res/values/loadresources.xml      | 374 ++++----
 .../res/values/loadresources_debug.xml        |  52 +-
 AndorsTrail/res/values/strings.xml            | 488 +++++-----
 AndorsTrail/res/values/strings_about.xml      |   2 +-
 AndorsTrail/res/values/styles.xml             |   6 +-
 AndorsTrail/res/values/ui_colors.xml          |   4 +-
 AndorsTrail/res/values/ui_dimen.xml           |  14 +-
 AndorsTrail/res/values/ui_ids.xml             |   6 +-
 AndorsTrail/res/values/ui_listviewstyle.xml   |   4 +-
 AndorsTrail/res/values/ui_styles.xml          |  70 +-
 AndorsTrail/res/values/worldmap_template.xml  |   2 +-
 AndorsTrail/res/xml/preferences.xml           |  26 +-
 .../AndorsTrail/AndorsTrailApplication.java   | 108 +--
 .../AndorsTrail/AndorsTrailPreferences.java   | 188 ++--
 .../src/com/gpl/rpg/AndorsTrail/Dialogs.java  | 124 +--
 .../AndorsTrail/VisualEffectCollection.java   |   4 +-
 .../com/gpl/rpg/AndorsTrail/WorldSetup.java   |  50 +-
 .../AndorsTrail/activity/AboutActivity.java   |  66 +-
 .../activity/ActorConditionInfoActivity.java  | 108 +--
 .../activity/BulkSelectionInterface.java      | 136 +--
 .../activity/ConversationActivity.java        | 140 +--
 .../AndorsTrail/activity/DebugInterface.java  | 228 ++---
 .../activity/DisplayWorldMapActivity.java     |  82 +-
 .../activity/HeroinfoActivity.java            |  60 +-
 .../activity/ItemInfoActivity.java            | 122 +--
 .../AndorsTrail/activity/LevelUpActivity.java | 120 +--
 .../activity/LoadSaveActivity.java            | 296 +++----
 .../AndorsTrail/activity/LoadingActivity.java | 164 ++--
 .../AndorsTrail/activity/MainActivity.java    | 182 ++--
 .../activity/MonsterEncounterActivity.java    |  58 +-
 .../activity/MonsterInfoActivity.java         | 208 ++---
 .../AndorsTrail/activity/ShopActivity.java    |  26 +-
 .../activity/SkillInfoActivity.java           | 122 +--
 .../activity/StartScreenActivity.java         | 150 ++--
 .../fragment/HeroinfoActivity_Inventory.java  | 244 ++---
 .../fragment/HeroinfoActivity_Quests.java     | 294 +++---
 .../fragment/HeroinfoActivity_Skills.java     |  24 +-
 .../fragment/HeroinfoActivity_Stats.java      | 130 +--
 .../fragment/ShopActivityFragment.java        |  44 +-
 .../activity/fragment/ShopActivity_Buy.java   |   8 +-
 .../activity/fragment/ShopActivity_Sell.java  |   6 +-
 .../context/ControllerContext.java            | 122 +--
 .../rpg/AndorsTrail/context/WorldContext.java | 130 +--
 .../controller/ActorStatsController.java      | 124 +--
 .../controller/CombatController.java          | 196 ++--
 .../rpg/AndorsTrail/controller/Constants.java |  10 +-
 .../controller/ConversationController.java    | 594 ++++++-------
 .../controller/GameRoundController.java       | 104 +--
 .../controller/InputController.java           |  36 +-
 .../controller/ItemController.java            | 116 +--
 .../AndorsTrail/controller/MapController.java |  34 +-
 .../controller/MonsterMovementController.java | 150 ++--
 .../controller/MonsterSpawningController.java |  22 +-
 .../controller/MovementController.java        | 226 ++---
 .../AndorsTrail/controller/PathFinder.java    |  42 +-
 .../controller/SkillController.java           |  74 +-
 .../controller/VisualEffectController.java    |  40 +-
 .../controller/WorldMapController.java        | 110 +--
 .../listeners/CombatActionListener.java       |   2 +-
 .../listeners/CombatActionListeners.java      |  28 +-
 .../listeners/CombatSelectionListeners.java   |   8 +-
 .../listeners/CombatTurnListeners.java        |  10 +-
 .../listeners/GameRoundListeners.java         |   6 +-
 .../listeners/MonsterMovementListeners.java   |   6 +-
 .../listeners/MonsterSpawnListeners.java      |  10 +-
 .../listeners/PlayerMovementListeners.java    |   6 +-
 .../listeners/WorldEventListeners.java        |  14 +-
 .../conversation/ConversationCollection.java  |   4 +-
 .../conversation/ConversationLoader.java      |   8 +-
 .../rpg/AndorsTrail/conversation/Phrase.java  |  18 +-
 .../rpg/AndorsTrail/model/GameStatistics.java | 352 ++++----
 .../rpg/AndorsTrail/model/InterfaceData.java  |  10 +-
 .../rpg/AndorsTrail/model/ModelContainer.java |   6 +-
 .../model/ability/ActorCondition.java         |  10 +-
 .../model/ability/ActorConditionEffect.java   |   6 +-
 .../model/ability/ActorConditionType.java     |   8 +-
 .../ability/ActorConditionTypeCollection.java |   4 +-
 .../model/ability/SkillCollection.java        | 462 +++++-----
 .../AndorsTrail/model/ability/SkillInfo.java  |  20 +-
 .../ability/traits/AbilityModifierTraits.java |  10 +-
 .../ability/traits/StatsModifierTraits.java   |   6 +-
 .../rpg/AndorsTrail/model/actor/Actor.java    |  16 +-
 .../rpg/AndorsTrail/model/actor/Monster.java  |  22 +-
 .../AndorsTrail/model/actor/MonsterType.java  |  18 +-
 .../model/actor/MonsterTypeCollection.java    |  10 +-
 .../rpg/AndorsTrail/model/actor/Player.java   |  50 +-
 .../rpg/AndorsTrail/model/item/DropList.java  |  10 +-
 .../model/item/DropListCollection.java        |  66 +-
 .../rpg/AndorsTrail/model/item/Inventory.java | 272 +++---
 .../AndorsTrail/model/item/ItemCategory.java  |   2 +-
 .../model/item/ItemCategoryCollection.java    |  59 +-
 .../AndorsTrail/model/item/ItemContainer.java | 278 +++---
 .../model/item/ItemTraits_OnEquip.java        |   4 +-
 .../model/item/ItemTraits_OnUse.java          |   2 +-
 .../rpg/AndorsTrail/model/item/ItemType.java  | 218 ++---
 .../model/item/ItemTypeCollection.java        |  75 +-
 .../gpl/rpg/AndorsTrail/model/item/Loot.java  |  14 +-
 .../listeners/ActorConditionListeners.java    |   2 +-
 .../model/listeners/ActorStatsListeners.java  |   4 +-
 .../model/listeners/PlayerStatsListeners.java |   4 +-
 .../AndorsTrail/model/map/LayeredTileMap.java |   6 +-
 .../AndorsTrail/model/map/MapCollection.java  | 204 ++---
 .../rpg/AndorsTrail/model/map/MapLayer.java   |   4 +-
 .../rpg/AndorsTrail/model/map/MapObject.java  |   4 +-
 .../model/map/MonsterSpawnArea.java           |  12 +-
 .../AndorsTrail/model/map/PredefinedMap.java  | 108 +--
 .../model/map/TMXMapFileParser.java           |  56 +-
 .../model/map/WorldMapSegment.java            |   8 +-
 .../rpg/AndorsTrail/model/quest/Quest.java    |  92 +-
 .../model/quest/QuestCollection.java          |  78 +-
 .../model/quest/QuestLogEntry.java            |  30 +-
 .../model/quest/QuestProgress.java            |  64 +-
 .../resource/DynamicTileLoader.java           |  18 +-
 .../AndorsTrail/resource/ResourceLoader.java  | 570 ++++++------
 .../resource/TranslationLoader.java           | 274 +++---
 .../parsers/ActorConditionsTypeParser.java    |  12 +-
 .../parsers/ConversationListParser.java       |  18 +-
 .../resource/parsers/ItemCategoryParser.java  |  10 +-
 .../resource/parsers/ItemTraitsParser.java    |  10 +-
 .../resource/parsers/ItemTypeParser.java      |  42 +-
 .../resource/parsers/MonsterTypeParser.java   |  24 +-
 .../resource/parsers/QuestParser.java         |  14 +-
 .../resource/parsers/ResourceParserUtils.java |  14 +-
 .../resource/parsers/WorldMapParser.java      |  16 +-
 .../resource/tiles/ResourceFileTileset.java   |  30 +-
 .../AndorsTrail/resource/tiles/TileCache.java |  38 +-
 .../resource/tiles/TileCollection.java        |  10 +-
 .../resource/tiles/TileCutter.java            |   6 +-
 .../resource/tiles/TileManager.java           |  54 +-
 ...ySavegameFormatReaderForItemContainer.java |   2 +-
 .../LegacySavegameFormatReaderForPlayer.java  |  18 +-
 .../rpg/AndorsTrail/savegames/Savegames.java  |  36 +-
 .../com/gpl/rpg/AndorsTrail/util/Base64.java  |   6 +-
 .../gpl/rpg/AndorsTrail/util/ConstRange.java  |  12 +-
 .../com/gpl/rpg/AndorsTrail/util/Coord.java   |  10 +-
 .../gpl/rpg/AndorsTrail/util/CoordRect.java   |   6 +-
 .../src/com/gpl/rpg/AndorsTrail/util/L.java   |   2 +-
 .../rpg/AndorsTrail/util/ListOfListeners.java |  12 +-
 .../gpl/rpg/AndorsTrail/util/LruCache.java    | 516 +++++------
 .../com/gpl/rpg/AndorsTrail/util/Range.java   |  20 +-
 .../com/gpl/rpg/AndorsTrail/util/Size.java    |  76 +-
 .../AndorsTrail/util/TimedMessageTask.java    |  66 +-
 .../util/XmlResourceParserUtils.java          |   2 +-
 .../view/AbilityModifierInfoView.java         |  48 +-
 .../view/ActorConditionEffectList.java        |  24 +-
 .../AndorsTrail/view/ActorConditionList.java  |  22 +-
 .../gpl/rpg/AndorsTrail/view/CombatView.java  |  94 +-
 .../DisplayActiveActorConditionIcons.java     |  44 +-
 .../view/ItemContainerAdapter.java            |   6 +-
 .../rpg/AndorsTrail/view/ItemEffectsView.java |  42 +-
 .../view/ItemEffectsView_OnUse.java           |  30 +-
 .../gpl/rpg/AndorsTrail/view/MainView.java    | 356 ++++----
 .../gpl/rpg/AndorsTrail/view/QuickButton.java |  25 +-
 .../rpg/AndorsTrail/view/QuickitemView.java   |  28 +-
 .../gpl/rpg/AndorsTrail/view/RangeBar.java    |  20 +-
 .../view/ShopItemContainerAdapter.java        |  10 +-
 .../AndorsTrail/view/SkillListAdapter.java    |  18 +-
 .../gpl/rpg/AndorsTrail/view/StatusView.java  |  48 +-
 .../rpg/AndorsTrail/view/TraitsInfoView.java  |  26 +-
 .../rpg/AndorsTrail/view/VirtualDpadView.java |  60 +-
 223 files changed, 8661 insertions(+), 8662 deletions(-)

diff --git a/AndorsTrail/res/anim/hidecombatbar.xml b/AndorsTrail/res/anim/hidecombatbar.xml
index 77f471c13..0e1bf2db3 100644
--- a/AndorsTrail/res/anim/hidecombatbar.xml
+++ b/AndorsTrail/res/anim/hidecombatbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<translate 
+<translate
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:interpolator="@android:anim/accelerate_interpolator"
 	android:duration="300"
diff --git a/AndorsTrail/res/anim/hidetoolbox.xml b/AndorsTrail/res/anim/hidetoolbox.xml
index 7ef0eee89..57d9f68bd 100644
--- a/AndorsTrail/res/anim/hidetoolbox.xml
+++ b/AndorsTrail/res/anim/hidetoolbox.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<translate 
+<translate
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:interpolator="@android:anim/accelerate_interpolator"
 	android:duration="300"
diff --git a/AndorsTrail/res/anim/scalebeat.xml b/AndorsTrail/res/anim/scalebeat.xml
index 3471f26ab..b9f00f89a 100644
--- a/AndorsTrail/res/anim/scalebeat.xml
+++ b/AndorsTrail/res/anim/scalebeat.xml
@@ -8,7 +8,7 @@
 		android:fromXScale="1.0"
 		android:fromYScale="1.0"
 		android:toXScale="1.1"
-		android:toYScale="1.1" 
+		android:toYScale="1.1"
 		android:duration="100"
 		android:pivotX="50%"
 		android:pivotY="50%"
@@ -18,7 +18,7 @@
 		android:fromXScale="1.1"
 		android:fromYScale="1.1"
 		android:toXScale="1.0"
-		android:toYScale="1.0" 
+		android:toYScale="1.0"
 		android:duration="100"
 		android:startOffset="100"
 		android:pivotX="50%"
diff --git a/AndorsTrail/res/anim/scaledown.xml b/AndorsTrail/res/anim/scaledown.xml
index 0c15c5a1c..06e98ec86 100644
--- a/AndorsTrail/res/anim/scaledown.xml
+++ b/AndorsTrail/res/anim/scaledown.xml
@@ -5,7 +5,7 @@
 	android:fromXScale="1.0"
 	android:fromYScale="1.0"
 	android:toXScale="0.0"
-	android:toYScale="0.0" 
+	android:toYScale="0.0"
 	android:duration="300"
 	android:pivotX="50%"
 	android:pivotY="50%"
diff --git a/AndorsTrail/res/anim/scaleup.xml b/AndorsTrail/res/anim/scaleup.xml
index 138d2a36b..f0c774545 100644
--- a/AndorsTrail/res/anim/scaleup.xml
+++ b/AndorsTrail/res/anim/scaleup.xml
@@ -5,7 +5,7 @@
 	android:fromXScale="0.0"
 	android:fromYScale="0.0"
 	android:toXScale="1.0"
-	android:toYScale="1.0" 
+	android:toYScale="1.0"
 	android:duration="200"
 	android:pivotX="50%"
 	android:pivotY="50%"
diff --git a/AndorsTrail/res/anim/showcombatbar.xml b/AndorsTrail/res/anim/showcombatbar.xml
index aa6461964..4984a658e 100644
--- a/AndorsTrail/res/anim/showcombatbar.xml
+++ b/AndorsTrail/res/anim/showcombatbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<translate 
+<translate
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:interpolator="@android:anim/decelerate_interpolator"
 	android:duration="300"
diff --git a/AndorsTrail/res/anim/showtoolbox.xml b/AndorsTrail/res/anim/showtoolbox.xml
index f77856fb3..563ab73f4 100644
--- a/AndorsTrail/res/anim/showtoolbox.xml
+++ b/AndorsTrail/res/anim/showtoolbox.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<translate 
+<translate
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:interpolator="@android:anim/decelerate_interpolator"
 	android:duration="300"
diff --git a/AndorsTrail/res/drawable/ui_debug_background.xml b/AndorsTrail/res/drawable/ui_debug_background.xml
index ff1cfe25c..c74f0ced0 100644
--- a/AndorsTrail/res/drawable/ui_debug_background.xml
+++ b/AndorsTrail/res/drawable/ui_debug_background.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FF0000FF"/>
-    <stroke android:width="4dp" android:color="#FFFFFFFF"
-            android:dashWidth="1dp" android:dashGap="2dp" />
-    <padding android:left="7dp" android:top="7dp"
-            android:right="7dp" android:bottom="7dp" />
-    <corners android:radius="4dp" />
+	<solid android:color="#FF0000FF"/>
+	<stroke android:width="4dp" android:color="#FFFFFFFF"
+			android:dashWidth="1dp" android:dashGap="2dp" />
+	<padding android:left="7dp" android:top="7dp"
+			android:right="7dp" android:bottom="7dp" />
+	<corners android:radius="4dp" />
 </shape>
diff --git a/AndorsTrail/res/drawable/ui_gradientshape.xml b/AndorsTrail/res/drawable/ui_gradientshape.xml
index 024609a2e..a2a0b4955 100644
--- a/AndorsTrail/res/drawable/ui_gradientshape.xml
+++ b/AndorsTrail/res/drawable/ui_gradientshape.xml
@@ -2,6 +2,6 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
 	<gradient android:startColor="#444444" android:endColor="#777777" android:angle="270"/>
-	<!-- <padding android:left="2dp" android:top="2dp" android:right="2dp" android:bottom="2dp" />  -->
+	<!-- <padding android:left="2dp" android:top="2dp" android:right="2dp" android:bottom="2dp" /> -->
 	<corners android:radius="3dp" />
 </shape>
diff --git a/AndorsTrail/res/drawable/ui_gradientshape_translucent.xml b/AndorsTrail/res/drawable/ui_gradientshape_translucent.xml
index 65c7072de..614d2b60a 100644
--- a/AndorsTrail/res/drawable/ui_gradientshape_translucent.xml
+++ b/AndorsTrail/res/drawable/ui_gradientshape_translucent.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-	<gradient 
-		android:startColor="#FF444444" 
+	<gradient
+		android:startColor="#FF444444"
 		android:endColor="#44222222"
 		android:angle="270"
 	/>
diff --git a/AndorsTrail/res/drawable/ui_headerbackground.xml b/AndorsTrail/res/drawable/ui_headerbackground.xml
index db308381b..853cbfb87 100644
--- a/AndorsTrail/res/drawable/ui_headerbackground.xml
+++ b/AndorsTrail/res/drawable/ui_headerbackground.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <solid android:color="#FF555555" />
+	<solid android:color="#FF555555" />
 </shape>
diff --git a/AndorsTrail/res/drawable/ui_progress_health.xml b/AndorsTrail/res/drawable/ui_progress_health.xml
index e55b93ada..d481fa6e5 100644
--- a/AndorsTrail/res/drawable/ui_progress_health.xml
+++ b/AndorsTrail/res/drawable/ui_progress_health.xml
@@ -10,7 +10,7 @@
 		<clip android:drawable="@drawable/ui_red_foreground" />
 	</item>
 
-<!-- 
+<!--
 	<item android:id="@android:id/background">
 		<shape>
 			<corners android:radius="5dip" />
@@ -18,10 +18,10 @@
 				android:centerColor="#ff5a5d5a"
 				android:centerY="0.75"
 				android:endColor="#ff747674"
-				android:angle="270" /> 
+				android:angle="270" />
 		</shape>
 	</item>
-	
+
 	<item android:id="@android:id/secondaryProgress">
 		<clip>
 		<shape>
@@ -34,7 +34,7 @@
 		</shape>
 		</clip>
 	</item>
-	
+
 	<item android:id="@android:id/progress">
 		<clip>
 			<shape>
@@ -46,7 +46,7 @@
 					android:angle="270" />
 			</shape>
 		</clip>
-	</item> 
+	</item>
 -->
 
 </layer-list>
diff --git a/AndorsTrail/res/drawable/ui_startbackground.xml b/AndorsTrail/res/drawable/ui_startbackground.xml
index 2d8e853fc..f6c718fe2 100644
--- a/AndorsTrail/res/drawable/ui_startbackground.xml
+++ b/AndorsTrail/res/drawable/ui_startbackground.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <gradient 
-    	android:startColor="#999"
+	<gradient
+		android:startColor="#999"
 		android:endColor="#555"
 		android:angle="270"/>
 </shape>
diff --git a/AndorsTrail/res/drawable/ui_statustext.xml b/AndorsTrail/res/drawable/ui_statustext.xml
index 177d5c5e9..db5ee8622 100644
--- a/AndorsTrail/res/drawable/ui_statustext.xml
+++ b/AndorsTrail/res/drawable/ui_statustext.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-	<solid 
-		android:color="#8222"/>    
+	<solid
+		android:color="#8222"/>
 
-	<!-- 
-	<stroke 
+	<!--
+	<stroke
 		android:width="1dp"
 		android:color="#444"/>
 	-->
-		
+
 	<!--
 	<padding android:left="2dp"
 		android:top="2dp"
 		android:right="2dp"
 		android:bottom="2dp"/>
 	-->
-	
+
 	<corners android:radius="3dp" />
 </shape>
diff --git a/AndorsTrail/res/layout-land/heroinfo_inventory.xml b/AndorsTrail/res/layout-land/heroinfo_inventory.xml
index c18f8d995..c48730d39 100644
--- a/AndorsTrail/res/layout-land/heroinfo_inventory.xml
+++ b/AndorsTrail/res/layout-land/heroinfo_inventory.xml
@@ -18,18 +18,18 @@
 			android:layout_height="wrap_content"
 			android:text="@string/heroinfo_wornequipment"
 			/>
-		
+
 		<LinearLayout
 			android:layout_width="wrap_content"
 			android:layout_height="match_parent"
 			android:orientation="horizontal"
 			android:gravity="center_vertical"
 			>
-	
+
 			<include layout="@layout/heroinfo_equipped" />
-			
+
 			<include layout="@layout/heroinfo_statsicons" />
-			
+
 		</LinearLayout>
 
 	</LinearLayout>
@@ -47,8 +47,8 @@
 			android:layout_height="wrap_content"
 			android:text="@string/heroinfo_inventory"
 			/>
-	
-		<ListView 
+
+		<ListView
 			android:id="@+id/inventorylist_root"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/abilitymodifierview.xml b/AndorsTrail/res/layout/abilitymodifierview.xml
index 7a781d20b..0c1b665f6 100644
--- a/AndorsTrail/res/layout/abilitymodifierview.xml
+++ b/AndorsTrail/res/layout/abilitymodifierview.xml
@@ -5,77 +5,77 @@
 	android:layout_height="wrap_content"
 	>
 
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_attack_cost" 
-		android:id="@+id/abilitymodifierinfo_change_attack_cost" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_attack_cost"
+		android:id="@+id/abilitymodifierinfo_change_attack_cost"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-    	<TextView 
-		android:text="@string/iteminfo_effect_increase_attack_chance" 
-		android:id="@+id/abilitymodifierinfo_change_attack_chance" 
+		<TextView
+		android:text="@string/iteminfo_effect_increase_attack_chance"
+		android:id="@+id/abilitymodifierinfo_change_attack_chance"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_attack_damage" 
-		android:id="@+id/abilitymodifierinfo_change_attack_damage" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_attack_damage"
+		android:id="@+id/abilitymodifierinfo_change_attack_damage"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_critical_skill" 
-		android:id="@+id/abilitymodifierinfo_change_critical_skill" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_critical_skill"
+		android:id="@+id/abilitymodifierinfo_change_critical_skill"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_critical_multiplier" 
-		android:id="@+id/abilitymodifierinfo_change_critical_multiplier" 
+	<TextView
+		android:text="@string/iteminfo_effect_critical_multiplier"
+		android:id="@+id/abilitymodifierinfo_change_critical_multiplier"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_block_chance" 
-		android:id="@+id/abilitymodifierinfo_change_block_chance" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_block_chance"
+		android:id="@+id/abilitymodifierinfo_change_block_chance"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_damage_resistance" 
-		android:id="@+id/abilitymodifierinfo_change_damage_resistance" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_damage_resistance"
+		android:id="@+id/abilitymodifierinfo_change_damage_resistance"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_max_hp" 
-		android:id="@+id/abilitymodifierinfo_change_maxhp" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_max_hp"
+		android:id="@+id/abilitymodifierinfo_change_maxhp"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_max_ap" 
-		android:id="@+id/abilitymodifierinfo_change_maxap" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_max_ap"
+		android:id="@+id/abilitymodifierinfo_change_maxap"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_movecost" 
-		android:id="@+id/abilitymodifierinfo_change_movecost" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_movecost"
+		android:id="@+id/abilitymodifierinfo_change_movecost"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_use_cost" 
-		android:id="@+id/abilitymodifierinfo_change_use_cost" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_use_cost"
+		android:id="@+id/abilitymodifierinfo_change_use_cost"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	<TextView 
-		android:text="@string/iteminfo_effect_increase_reequip_cost" 
-		android:id="@+id/abilitymodifierinfo_change_reequip_cost" 
+	<TextView
+		android:text="@string/iteminfo_effect_increase_reequip_cost"
+		android:id="@+id/abilitymodifierinfo_change_reequip_cost"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-	
+
 </merge>
diff --git a/AndorsTrail/res/layout/about.xml b/AndorsTrail/res/layout/about.xml
index 7e518fd13..794d3f325 100644
--- a/AndorsTrail/res/layout/about.xml
+++ b/AndorsTrail/res/layout/about.xml
@@ -12,10 +12,10 @@
 		android:orientation="horizontal"
 		android:gravity="center_vertical"
 		>
-		<ImageView 
+		<ImageView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:src="@drawable/icon" 
+			android:src="@drawable/icon"
 			android:paddingRight="@dimen/dialog_iconpadding_right"
 			android:paddingBottom="@dimen/dialog_iconpadding_bottom"
 			/>
@@ -39,7 +39,7 @@
 				/>
 		</LinearLayout>
 	</LinearLayout>
-	
+
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -72,14 +72,14 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
-			android:text="@string/about_button1" 
+			android:text="@string/about_button1"
 			/>
 	</LinearLayout>
 
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		>	
+		>
 		<TextView
 			android:id="@+id/about_contents"
 			android:layout_width="match_parent"
diff --git a/AndorsTrail/res/layout/actorconditioninfo.xml b/AndorsTrail/res/layout/actorconditioninfo.xml
index e32c6b6fd..936e39762 100644
--- a/AndorsTrail/res/layout/actorconditioninfo.xml
+++ b/AndorsTrail/res/layout/actorconditioninfo.xml
@@ -6,7 +6,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical"
 	>
-	
+
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -22,82 +22,82 @@
 				android:id="@+id/actorconditioninfo_title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="@string/actorinfo_currentconditions" 
+				android:text="@string/actorinfo_currentconditions"
 				style="@style/titleWithIcon"
 				android:drawableLeft="@drawable/equip_weapon"
 				/>
-			
-			<TextView 
-				android:text="@string/actorconditioninfo_category" 
-				android:id="@+id/actorconditioninfo_category" 
+
+			<TextView
+				android:text="@string/actorconditioninfo_category"
+				android:id="@+id/actorconditioninfo_category"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="@dimen/section_margin"
 				/>
-			
-			<TextView 
-				android:text="@string/actorconditioninfo_constant_effect" 
-				android:id="@+id/actorconditioninfo_constant_effect_title" 
+
+			<TextView
+				android:text="@string/actorconditioninfo_constant_effect"
+				android:id="@+id/actorconditioninfo_constant_effect_title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				/>
-				
+
 				<com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
 					android:id="@+id/actorconditioninfo_constant_effect_abilitymodifierinfo"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginLeft="10sp"
 					/>
-			
-			<TextView 
-				android:text="@string/actorconditioninfo_effect_every_round" 
-				android:id="@+id/actorconditioninfo_everyround_title" 
+
+			<TextView
+				android:text="@string/actorconditioninfo_effect_every_round"
+				android:id="@+id/actorconditioninfo_everyround_title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				/>
-				
+
 				<LinearLayout
-					android:id="@+id/actorconditioninfo_everyround_list" 
+					android:id="@+id/actorconditioninfo_everyround_list"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginLeft="10sp"
 					android:orientation="vertical"
 					>
 				</LinearLayout>
-		
-			<TextView 
-				android:text="@string/actorconditioninfo_effect_every_full_round" 
-				android:id="@+id/actorconditioninfo_everyfullround_title" 
+
+			<TextView
+				android:text="@string/actorconditioninfo_effect_every_full_round"
+				android:id="@+id/actorconditioninfo_everyfullround_title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				/>
-				
+
 				<LinearLayout
-					android:id="@+id/actorconditioninfo_everyfullround_list" 
+					android:id="@+id/actorconditioninfo_everyfullround_list"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginLeft="10sp"
 					android:orientation="vertical"
 					>
 				</LinearLayout>
-			
+
 		</LinearLayout>
 	</ScrollView>
 
 	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />  
-	
+	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		style="@android:style/ButtonBar"
 		>
-			
-		<Button 
+
+		<Button
 			android:id="@+id/actorconditioninfo_close"
 			android:layout_width="match_parent"
-            android:layout_weight="1"
+			android:layout_weight="1"
 			android:layout_height="wrap_content"
 			android:text="@string/dialog_close"
 			/>
diff --git a/AndorsTrail/res/layout/bulkselection.xml b/AndorsTrail/res/layout/bulkselection.xml
index fa8fa4fee..b0adaffcf 100644
--- a/AndorsTrail/res/layout/bulkselection.xml
+++ b/AndorsTrail/res/layout/bulkselection.xml
@@ -6,8 +6,8 @@
 	android:layout_height="wrap_content"
 	android:gravity="center_horizontal"
 	>
-	
-    <ScrollView
+
+	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
@@ -18,113 +18,113 @@
 			android:orientation="vertical"
 			android:padding="@dimen/dialog_margin"
 			>
-			
+
 			<TextView
 				android:id="@+id/bulkselection_itemname"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_horizontal"
-				android:text="@string/inventory_info" 
+				android:text="@string/inventory_info"
 				style="@style/titleWithIcon"
 				android:drawableLeft="@drawable/equip_weapon"
-			/>	
-			
-			<LinearLayout 
-				android:layout_height="wrap_content" 
+			/>
+
+			<LinearLayout
+				android:layout_height="wrap_content"
 				android:layout_width="match_parent"
 				android:orientation="horizontal"
 				android:gravity="center_horizontal"
 				>
-		
-		        <TextView 
-		        	android:text="@string/inventory_drop"
-		        	android:id="@+id/bulkselection_action_type"
-		        	android:layout_width="wrap_content" 
-		        	android:layout_height="wrap_content"
-		        	/>
-		        	
-		        <EditText 
-		        	android:text="1" 
-		        	android:inputType="number"
-		        	android:singleLine="true"
-		        	android:id="@+id/bulkselection_amount_taken"
-		        	android:layout_height="wrap_content"
-		        	android:layout_width="wrap_content"
-		        	/>
-		          	
-				<TextView 
+
+				<TextView
+					android:text="@string/inventory_drop"
+					android:id="@+id/bulkselection_action_type"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					/>
+
+				<EditText
+					android:text="1"
+					android:inputType="number"
+					android:singleLine="true"
+					android:id="@+id/bulkselection_amount_taken"
+					android:layout_height="wrap_content"
+					android:layout_width="wrap_content"
+					/>
+
+				<TextView
 					android:text="/"
-					android:layout_width="wrap_content" 
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:paddingLeft="10dp"
 					android:paddingRight="10dp"
 					/>
-				
-				<TextView 
+
+				<TextView
 					android:text="250"
 					android:id="@+id/bulkselection_amount_available"
-					android:layout_width="wrap_content" 
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					/>
-		        	
-		    </LinearLayout>
-		
-			<LinearLayout 
-				android:layout_height="wrap_content" 
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:layout_height="wrap_content"
 				android:layout_width="match_parent"
 				android:orientation="horizontal"
 				>
-		
-		        <Button 
-		        	android:text="-1" 
-		        	android:id="@+id/bulkselection_decrement_button" 
-		        	android:layout_width="wrap_content" 
-		        	android:layout_height="wrap_content"
-		        	android:paddingLeft="20dp"
-		        	android:paddingRight="20dp"
-		        	/>
-		
-		 		<SeekBar 
-					android:id="@+id/bulkselection_slider" 
+
+				<Button
+					android:text="-1"
+					android:id="@+id/bulkselection_decrement_button"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:paddingLeft="20dp"
+					android:paddingRight="20dp"
+					/>
+
+		 		<SeekBar
+					android:id="@+id/bulkselection_slider"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content" 
+					android:layout_height="wrap_content"
 					android:layout_gravity="center_vertical"
 					android:layout_weight="1"
 					/>
-		
-		        <Button 
-		        	android:text="+1" 
-		        	android:id="@+id/bulkselection_increment_button" 
-		        	android:layout_width="wrap_content" 
-		        	android:layout_height="wrap_content"
-		        	android:paddingLeft="20dp"
-		        	android:paddingRight="20dp"
-		        	/>
-		        	
-		       	<Button 
-		        	android:text="@string/bulkselection_select_all" 
-		        	android:id="@+id/bulkselection_select_all_button" 
-		        	android:layout_width="wrap_content" 
-		        	android:layout_height="wrap_content"
-		        	android:paddingLeft="20dp"
-		        	android:paddingRight="20dp"
-		        	/>
-		        	
-		    </LinearLayout>
-		
-			<TextView 
-		       	android:text="@string/bulkselection_totalcost_buy"
-		       	android:id="@+id/bulkselection_summary_totalgold"
-		       	android:layout_width="match_parent" 
-		       	android:layout_height="wrap_content"
-		       	android:paddingBottom="10dp"
-		       	/>
-			
+
+				<Button
+					android:text="+1"
+					android:id="@+id/bulkselection_increment_button"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:paddingLeft="20dp"
+					android:paddingRight="20dp"
+					/>
+
+				<Button
+					android:text="@string/bulkselection_select_all"
+					android:id="@+id/bulkselection_select_all_button"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:paddingLeft="20dp"
+					android:paddingRight="20dp"
+					/>
+
+			</LinearLayout>
+
+			<TextView
+				android:text="@string/bulkselection_totalcost_buy"
+				android:id="@+id/bulkselection_summary_totalgold"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:paddingBottom="10dp"
+				/>
+
 		</LinearLayout>
 	</ScrollView>
 
 	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />  
+	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -132,23 +132,23 @@
 		android:orientation="horizontal"
 		style="@android:style/ButtonBar"
 		>
-		
-        <Button 
-	        android:id="@+id/bulkselection_finalize_button" 
-	        android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:text="@string/inventory_drop" 
-	        />
-	        
-        <Button 
-	        android:id="@+id/bulkselection_cancel_button" 
-	        android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:text="@android:string/cancel" 
-	        />
-	     
+
+		<Button
+			android:id="@+id/bulkselection_finalize_button"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/inventory_drop"
+			/>
+
+		<Button
+			android:id="@+id/bulkselection_cancel_button"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@android:string/cancel"
+			/>
+
 	</LinearLayout>
 
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/combatlog_row.xml b/AndorsTrail/res/layout/combatlog_row.xml
index f0d3b6938..c965efc1e 100644
--- a/AndorsTrail/res/layout/combatlog_row.xml
+++ b/AndorsTrail/res/layout/combatlog_row.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/text1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_centerVertical="true"
-    />
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@android:id/text1"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:layout_centerVertical="true"
+	/>
diff --git a/AndorsTrail/res/layout/combatview.xml b/AndorsTrail/res/layout/combatview.xml
index 92a72a623..af5d93cd2 100644
--- a/AndorsTrail/res/layout/combatview.xml
+++ b/AndorsTrail/res/layout/combatview.xml
@@ -11,14 +11,14 @@
 		android:gravity="center_vertical"
 		android:orientation="horizontal"
 		>
-               
+
 		<Button android:id="@+id/combatview_moveattack"
 			android:layout_width="wrap_content"
 			android:layout_height="@dimen/smalltext_buttonheight"
 			android:textSize="@dimen/actionbar_text"
 			android:text="@string/combat_attack"
 			/>
-	 
+
 		<TextView android:id="@+id/combatview_status"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
 			android:textSize="@dimen/actionbar_text"
 			android:text="@string/combat_endturn"
 			/>
-	
+
 		<Button android:id="@+id/combatview_flee"
 			android:layout_width="wrap_content"
 			android:layout_height="@dimen/smalltext_buttonheight"
@@ -47,7 +47,7 @@
 			/>
 
 	</LinearLayout>
-	
+
 	<TextView android:id="@+id/combatview_monsterismoving"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -61,7 +61,7 @@
 		android:text="@string/combat_monsteraction"
 		android:gravity="center"
 		/>
-	
+
 	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/combatview_monsterbar"
 		android:layout_width="match_parent"
@@ -77,13 +77,13 @@
 			android:layout_marginRight="5sp"
 			android:contentDescription="@string/dialog_monsterencounter_info"
 			/>
-		
+
 		<com.gpl.rpg.AndorsTrail.view.RangeBar
 			android:id="@+id/combatview_monsterhealth"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-	        />
-		 
+			/>
+
 	</LinearLayout>
-	
+
 </merge>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/conversation.xml b/AndorsTrail/res/layout/conversation.xml
index 3e7992a8c..bc6b4601c 100644
--- a/AndorsTrail/res/layout/conversation.xml
+++ b/AndorsTrail/res/layout/conversation.xml
@@ -5,7 +5,7 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
 	>
-	
+
 	<ListView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -25,22 +25,22 @@
 		android:gravity="center_vertical"
 		style="@android:style/ButtonBar"
 		>
-			
-		<Button 
+
+		<Button
 			android:id="@+id/conversation_next"
 			android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:text="@string/conversation_next"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/conversation_next"
 			/>
-			
-		<Button 
+
+		<Button
 			android:id="@+id/conversation_leave"
 			android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:text="@string/conversation_leave"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/conversation_leave"
 			/>
 	</LinearLayout>
-	
+
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/displayworldmap.xml b/AndorsTrail/res/layout/displayworldmap.xml
index ea42a9203..5e0ba16fe 100644
--- a/AndorsTrail/res/layout/displayworldmap.xml
+++ b/AndorsTrail/res/layout/displayworldmap.xml
@@ -2,43 +2,43 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
-    android:layout_height="match_parent" 
-	android:orientation="vertical" 
+	android:layout_height="match_parent"
+	android:orientation="vertical"
 	>
-	
-    <LinearLayout 
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content" 
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		android:background="@drawable/ui_gradientshape"
 		android:padding="@dimen/boxshape_margin"
 		>
-	    
-        <TextView 
-            android:layout_width="0dip"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="1"
-		    android:text="@string/menu_button_worldmap"
-		    style="@style/textWithIcon"
-		    android:textSize="@dimen/titletext"
+
+		<TextView
+			android:layout_width="0dip"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/menu_button_worldmap"
+			style="@style/textWithIcon"
+			android:textSize="@dimen/titletext"
 			android:drawableLeft="@android:drawable/ic_dialog_map"
-			
+
 			/>
 
-        <Button 
-            android:id="@+id/displayworldmap_close"
-            android:layout_width="wrap_content"
-		    android:layout_height="wrap_content" 
+		<Button
+			android:id="@+id/displayworldmap_close"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
 			style="?android:attr/buttonStyleSmall"
 			android:text="@string/dialog_close"
 			/>
-        
-    </LinearLayout>
-	
-	<WebView 
+
+	</LinearLayout>
+
+	<WebView
 		android:layout_width="match_parent"
-		android:layout_height="match_parent" 
+		android:layout_height="match_parent"
 		android:id="@+id/displayworldmap_webview"
 		/>
-	
+
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/heroinfo_equipped.xml b/AndorsTrail/res/layout/heroinfo_equipped.xml
index e5e4c74f5..b2f916be2 100644
--- a/AndorsTrail/res/layout/heroinfo_equipped.xml
+++ b/AndorsTrail/res/layout/heroinfo_equipped.xml
@@ -12,7 +12,7 @@
 		android:layout_centerInParent="true"
 		android:id="@+id/heroinfo_worn_center"
 		>
-		<ImageView 
+		<ImageView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_centerInParent="true"
@@ -21,7 +21,7 @@
 	</RelativeLayout>
 
 	<!-- TOP -->
-	
+
 	<LinearLayout
 		android:layout_above="@id/heroinfo_worn_center"
 		android:layout_centerHorizontal="true"
@@ -33,13 +33,13 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			>
-			<ImageView 
+			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true"
 				android:src="@drawable/equip_square"
 				/>
-			<ImageView 
+			<ImageView
 				android:id="@+id/heroinfo_worn_head"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -52,13 +52,13 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			>
-			<ImageView 
+			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true"
 				android:src="@drawable/equip_square"
 				/>
-			<ImageView 
+			<ImageView
 				android:id="@+id/heroinfo_worn_body"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -71,13 +71,13 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			>
-			<ImageView 
+			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true"
 				android:src="@drawable/equip_square"
 				/>
-			<ImageView 
+			<ImageView
 				android:id="@+id/heroinfo_worn_neck"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -87,9 +87,9 @@
 		</RelativeLayout>
 
 	</LinearLayout>
-	
+
 	<!-- BOTTOM -->
-	
+
 	<LinearLayout
 		android:layout_below="@id/heroinfo_worn_center"
 		android:layout_centerHorizontal="true"
@@ -101,13 +101,13 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			>
-			<ImageView 
+			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true"
 				android:src="@drawable/equip_square"
 				/>
-			<ImageView 
+			<ImageView
 				android:id="@+id/heroinfo_worn_hand"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -120,13 +120,13 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			>
-			<ImageView 
+			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true"
 				android:src="@drawable/equip_square"
 				/>
-			<ImageView 
+			<ImageView
 				android:id="@+id/heroinfo_worn_feet"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -136,7 +136,7 @@
 		</RelativeLayout>
 
 	</LinearLayout>
-	
+
 	<!-- LEFT -->
 
 	<LinearLayout
@@ -150,13 +150,13 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			>
-			<ImageView 
+			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true"
 				android:src="@drawable/equip_square"
 				/>
-			<ImageView 
+			<ImageView
 				android:id="@+id/heroinfo_worn_weapon"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -169,13 +169,13 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			>
-			<ImageView 
+			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true"
 				android:src="@drawable/equip_square"
 				/>
-			<ImageView 
+			<ImageView
 				android:id="@+id/heroinfo_worn_ringleft"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -185,9 +185,9 @@
 		</RelativeLayout>
 
 	</LinearLayout>
-					
+
 	<!-- RIGHT -->
-	
+
 	<LinearLayout
 		android:layout_toRightOf="@id/heroinfo_worn_center"
 		android:layout_centerVertical="true"
@@ -199,13 +199,13 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			>
-			<ImageView 
+			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true"
 				android:src="@drawable/equip_square"
 				/>
-			<ImageView 
+			<ImageView
 				android:id="@+id/heroinfo_worn_shield"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
@@ -218,13 +218,13 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			>
-			<ImageView 
+			<ImageView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_centerInParent="true"
 				android:src="@drawable/equip_square"
 				/>
-			<ImageView 
+			<ImageView
 				android:id="@+id/heroinfo_worn_ringright"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/heroinfo_inventory.xml b/AndorsTrail/res/layout/heroinfo_inventory.xml
index bc0945f1c..3ca4ba0f6 100644
--- a/AndorsTrail/res/layout/heroinfo_inventory.xml
+++ b/AndorsTrail/res/layout/heroinfo_inventory.xml
@@ -12,7 +12,7 @@
 		android:layout_height="wrap_content"
 		android:text="@string/heroinfo_wornequipment"
 		/>
-	
+
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -21,9 +21,9 @@
 		>
 
 		<include layout="@layout/heroinfo_equipped" />
-		
+
 		<include layout="@layout/heroinfo_statsicons" />
-		
+
 	</LinearLayout>
 
 
@@ -33,7 +33,7 @@
 		android:text="@string/heroinfo_inventory"
 		/>
 
-	<ListView 
+	<ListView
 		android:id="@+id/inventorylist_root"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/heroinfo_skill_list.xml b/AndorsTrail/res/layout/heroinfo_skill_list.xml
index 0a6a08cbc..a764e30bd 100644
--- a/AndorsTrail/res/layout/heroinfo_skill_list.xml
+++ b/AndorsTrail/res/layout/heroinfo_skill_list.xml
@@ -4,20 +4,20 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	>
-	<TextView  
-		android:layout_width="match_parent" 
-		android:layout_height="wrap_content" 
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
 		android:text="@string/skill_number_of_increases_several"
-		android:id="@+id/heroinfo_listskills_number_of_increases" 
+		android:id="@+id/heroinfo_listskills_number_of_increases"
 		android:layout_marginBottom="@dimen/section_margin"
 		android:layout_marginTop="@dimen/section_margin"
 		android:layout_gravity="center_horizontal"
 		/>
-	
-	<ListView 
-		android:layout_width="match_parent" 
-		android:layout_height="wrap_content" 
-		android:id="@+id/heroinfo_listskills_list" 
+
+	<ListView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/heroinfo_listskills_list"
 		/>
 
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/heroinfo_stats.xml b/AndorsTrail/res/layout/heroinfo_stats.xml
index cc0844fc2..b65734994 100644
--- a/AndorsTrail/res/layout/heroinfo_stats.xml
+++ b/AndorsTrail/res/layout/heroinfo_stats.xml
@@ -1,129 +1,129 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center_horizontal"
-    android:orientation="vertical"
-    android:padding="@dimen/dialog_margin" >
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:layout_gravity="center_horizontal"
+	android:orientation="vertical"
+	android:padding="@dimen/dialog_margin" >
 
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" >
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1" >
 
-        <LinearLayout
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
+		<LinearLayout
+			xmlns:android="http://schemas.android.com/apk/res/android"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
 			android:id="@+id/heroinfo_container"
 			>
 
-            <TextView
-                android:id="@+id/heroinfo_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/titleWithIcon"
-                android:drawableLeft="@drawable/char_hero"
-                android:text="Name"
+			<TextView
+				android:id="@+id/heroinfo_title"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				style="@style/titleWithIcon"
+				android:drawableLeft="@drawable/char_hero"
+				android:text="Name"
 				/>
 
-            <TableLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/section_margin" >
+			<TableLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/section_margin" >
 
-                <TableRow>
-                    <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_level" />
-                    <TextView android:id="@+id/heroinfo_level" android:text="1" />
-                </TableRow>
+				<TableRow>
+					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_level" />
+					<TextView android:id="@+id/heroinfo_level" android:text="1" />
+				</TableRow>
 
-                <TableRow>
-                    <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_totalexperience" />
-                    <TextView android:id="@+id/heroinfo_totalexperience" android:text="1" />
-                </TableRow>
-            </TableLayout>
+				<TableRow>
+					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_totalexperience" />
+					<TextView android:id="@+id/heroinfo_totalexperience" android:text="1" />
+				</TableRow>
+			</TableLayout>
 
-            <com.gpl.rpg.AndorsTrail.view.RangeBar
-                android:id="@+id/heroinfo_healthbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+			<com.gpl.rpg.AndorsTrail.view.RangeBar
+				android:id="@+id/heroinfo_healthbar"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content" />
 
-            <com.gpl.rpg.AndorsTrail.view.RangeBar
-                android:id="@+id/heroinfo_expbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5sp" />
+			<com.gpl.rpg.AndorsTrail.view.RangeBar
+				android:id="@+id/heroinfo_expbar"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginTop="5sp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/actorinfo_currenttraits"
-                style="@style/actorinfo_sectionheader"
-                />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@drawable/ui_headerbackground"
-                />
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/actorinfo_currenttraits"
+				style="@style/actorinfo_sectionheader"
+				/>
+			<View
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:background="@drawable/ui_headerbackground"
+				/>
 
 			<TableLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:id="@+id/actorinfo_stats_table"
 				>
-                <TableRow>
-                    <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_actionpoints" />
-                    <TextView android:id="@+id/heroinfo_ap" />
-                </TableRow>
-                <TableRow>
-                    <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_reequip_cost" />
-                    <TextView android:id="@+id/heroinfo_reequip_cost" />
-                </TableRow>
-                <TableRow>
-                    <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_useitem_cost" />
-                    <TextView android:id="@+id/heroinfo_useitem_cost" />
-                </TableRow>
+				<TableRow>
+					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_actionpoints" />
+					<TextView android:id="@+id/heroinfo_ap" />
+				</TableRow>
+				<TableRow>
+					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_reequip_cost" />
+					<TextView android:id="@+id/heroinfo_reequip_cost" />
+				</TableRow>
+				<TableRow>
+					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_useitem_cost" />
+					<TextView android:id="@+id/heroinfo_useitem_cost" />
+				</TableRow>
 				<include layout="@layout/traitsinfoview" />
 			</TableLayout>
-			
+
 			<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
 				android:id="@+id/actorinfo_onhiteffects"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				/>
-			
+
 			<TextView
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:text="@string/actorinfo_currentconditions"
 				android:id="@+id/actorinfo_currentconditions_title"
-                style="@style/actorinfo_sectionheader"
-                />
+				style="@style/actorinfo_sectionheader"
+				/>
 			<com.gpl.rpg.AndorsTrail.view.ActorConditionList
 				android:id="@+id/actorinfo_currentconditions"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content" 
+				android:layout_height="wrap_content"
 				/>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/actorinfo_basetraits"
-                style="@style/actorinfo_sectionheader"
-                />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@drawable/ui_headerbackground"
-                />
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/actorinfo_basetraits"
+				style="@style/actorinfo_sectionheader"
+				/>
+			<View
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:background="@drawable/ui_headerbackground"
+				/>
 
-            <TableLayout
+			<TableLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:id="@+id/heroinfo_basestats_table"
 				>
-                <TableRow>
+				<TableRow>
 					<TextView style="@style/traitsinfo_label" android:text="@string/traitsinfo_base_max_hp" />
 					<TextView android:id="@+id/basetraitsinfo_max_hp" />
 				</TableRow>
@@ -131,46 +131,46 @@
 					<TextView style="@style/traitsinfo_label" android:text="@string/traitsinfo_base_max_ap" />
 					<TextView android:id="@+id/basetraitsinfo_max_ap" />
 				</TableRow>
-                <TableRow>
-                    <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_reequip_cost" />
-                    <TextView android:id="@+id/heroinfo_base_reequip_cost" />
-                </TableRow>
-                <TableRow>
-                    <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_useitem_cost" />
-                    <TextView android:id="@+id/heroinfo_base_useitem_cost" />
-                </TableRow>
+				<TableRow>
+					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_reequip_cost" />
+					<TextView android:id="@+id/heroinfo_base_reequip_cost" />
+				</TableRow>
+				<TableRow>
+					<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_useitem_cost" />
+					<TextView android:id="@+id/heroinfo_base_useitem_cost" />
+				</TableRow>
 				<include layout="@layout/traitsinfoview" />
 			</TableLayout>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/heroinfo_gamestats"
-                style="@style/actorinfo_sectionheader"
-                />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:id="@+id/actorinfo_currentconditions_title2"
-                android:background="@drawable/ui_headerbackground"
-                />
-            <include layout="@layout/heroinfo_stats_gamestats" />
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="@string/heroinfo_gamestats"
+				style="@style/actorinfo_sectionheader"
+				/>
+			<View
+				android:layout_width="match_parent"
+				android:layout_height="1dp"
+				android:id="@+id/actorinfo_currentconditions_title2"
+				android:background="@drawable/ui_headerbackground"
+				/>
+			<include layout="@layout/heroinfo_stats_gamestats" />
 
-        </LinearLayout>
-    </ScrollView>
+		</LinearLayout>
+	</ScrollView>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_vertical"
+		android:orientation="horizontal" >
 
-        <Button
-            android:id="@+id/heroinfo_levelup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-            android:text="@string/heroinfo_levelup" />
-    </LinearLayout>
+		<Button
+			android:id="@+id/heroinfo_levelup"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/heroinfo_levelup" />
+	</LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/heroinfo_stats_gamestats.xml b/AndorsTrail/res/layout/heroinfo_stats_gamestats.xml
index 982c1ba33..961110414 100644
--- a/AndorsTrail/res/layout/heroinfo_stats_gamestats.xml
+++ b/AndorsTrail/res/layout/heroinfo_stats_gamestats.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/heroinfo_gamestats_table"
-        >
-    <TableRow android:id="@+id/heroinfo_gamestats_quests_row">
-        <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_quests" />
-        <TextView android:id="@+id/heroinfo_gamestats_quests" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_visited_maps_row">
-        <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_visited_maps" />
-        <TextView android:id="@+id/heroinfo_gamestats_visited_maps" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_deaths_row">
-        <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_deaths" />
-        <TextView android:id="@+id/heroinfo_gamestats_deaths" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_spent_gold_row">
-        <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_spent_gold" />
-        <TextView android:id="@+id/heroinfo_gamestats_spent_gold" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_bonemeals_row">
-        <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_bonemeals" />
-        <TextView android:id="@+id/heroinfo_gamestats_bonemeals" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_num_used_items_row">
-        <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_num_used_items" />
-        <TextView android:id="@+id/heroinfo_gamestats_num_used_items" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_num_killed_monsters_row">
-        <TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_num_killed_monsters" />
-        <TextView android:id="@+id/heroinfo_gamestats_num_killed_monsters" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_fav_item_row1">
-        <TextView style="@style/traitsinfo_2linelabel" android:text="@string/heroinfo_gamestats_fav_item" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_fav_item_row2">
-        <TextView style="@style/traitsinfo_2linevalue" android:id="@+id/heroinfo_gamestats_fav_item" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_top_boss_row1">
-        <TextView style="@style/traitsinfo_2linelabel" android:text="@string/heroinfo_gamestats_top_boss" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_top_boss_row2">
-        <TextView style="@style/traitsinfo_2linevalue" android:id="@+id/heroinfo_gamestats_top_boss" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_fav_monsters_row1">
-        <TextView style="@style/traitsinfo_2linelabel" android:text="@string/heroinfo_gamestats_fav_monsters" />
-    </TableRow>
-    <TableRow android:id="@+id/heroinfo_gamestats_fav_monsters_row2">
-        <TextView style="@style/traitsinfo_2linevalue" android:id="@+id/heroinfo_gamestats_fav_monsters" />
-    </TableRow>
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/heroinfo_gamestats_table"
+		>
+	<TableRow android:id="@+id/heroinfo_gamestats_quests_row">
+		<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_quests" />
+		<TextView android:id="@+id/heroinfo_gamestats_quests" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_visited_maps_row">
+		<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_visited_maps" />
+		<TextView android:id="@+id/heroinfo_gamestats_visited_maps" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_deaths_row">
+		<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_deaths" />
+		<TextView android:id="@+id/heroinfo_gamestats_deaths" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_spent_gold_row">
+		<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_spent_gold" />
+		<TextView android:id="@+id/heroinfo_gamestats_spent_gold" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_bonemeals_row">
+		<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_bonemeals" />
+		<TextView android:id="@+id/heroinfo_gamestats_bonemeals" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_num_used_items_row">
+		<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_num_used_items" />
+		<TextView android:id="@+id/heroinfo_gamestats_num_used_items" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_num_killed_monsters_row">
+		<TextView style="@style/traitsinfo_label" android:text="@string/heroinfo_gamestats_num_killed_monsters" />
+		<TextView android:id="@+id/heroinfo_gamestats_num_killed_monsters" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_fav_item_row1">
+		<TextView style="@style/traitsinfo_2linelabel" android:text="@string/heroinfo_gamestats_fav_item" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_fav_item_row2">
+		<TextView style="@style/traitsinfo_2linevalue" android:id="@+id/heroinfo_gamestats_fav_item" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_top_boss_row1">
+		<TextView style="@style/traitsinfo_2linelabel" android:text="@string/heroinfo_gamestats_top_boss" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_top_boss_row2">
+		<TextView style="@style/traitsinfo_2linevalue" android:id="@+id/heroinfo_gamestats_top_boss" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_fav_monsters_row1">
+		<TextView style="@style/traitsinfo_2linelabel" android:text="@string/heroinfo_gamestats_fav_monsters" />
+	</TableRow>
+	<TableRow android:id="@+id/heroinfo_gamestats_fav_monsters_row2">
+		<TextView style="@style/traitsinfo_2linevalue" android:id="@+id/heroinfo_gamestats_fav_monsters" />
+	</TableRow>
 </TableLayout>
diff --git a/AndorsTrail/res/layout/heroinfo_statsicons.xml b/AndorsTrail/res/layout/heroinfo_statsicons.xml
index 4279ae365..d4f709924 100644
--- a/AndorsTrail/res/layout/heroinfo_statsicons.xml
+++ b/AndorsTrail/res/layout/heroinfo_statsicons.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="right"
-    android:orientation="vertical" >
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:gravity="right"
+	android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/heroinfo_stats_gold"
-        style="@style/statsBoxStyle"
-        android:layout_width="@dimen/boxshape_width"
-        android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/ui_icon_coins"
-        android:text="@string/shop_yourgold"
-        />
+	<TextView
+		android:id="@+id/heroinfo_stats_gold"
+		style="@style/statsBoxStyle"
+		android:layout_width="@dimen/boxshape_width"
+		android:layout_height="wrap_content"
+		android:drawableLeft="@drawable/ui_icon_coins"
+		android:text="@string/shop_yourgold"
+		/>
 
-    <TextView
-        android:id="@+id/heroinfo_stats_attack"
-        style="@style/statsBoxStyle"
-        android:layout_width="@dimen/boxshape_width"
-        android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/equip_weapon"
-        android:text="@string/actorinfo_attack"
-        />
+	<TextView
+		android:id="@+id/heroinfo_stats_attack"
+		style="@style/statsBoxStyle"
+		android:layout_width="@dimen/boxshape_width"
+		android:layout_height="wrap_content"
+		android:drawableLeft="@drawable/equip_weapon"
+		android:text="@string/actorinfo_attack"
+		/>
 
-    <TextView
-        android:id="@+id/heroinfo_stats_defense"
-        style="@style/statsBoxStyle"
-        android:layout_width="@dimen/boxshape_width"
-        android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/equip_shield"
-        android:text="@string/actorinfo_defense"
+	<TextView
+		android:id="@+id/heroinfo_stats_defense"
+		style="@style/statsBoxStyle"
+		android:layout_width="@dimen/boxshape_width"
+		android:layout_height="wrap_content"
+		android:drawableLeft="@drawable/equip_shield"
+		android:text="@string/actorinfo_defense"
 		/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/inventoryitemview.xml b/AndorsTrail/res/layout/inventoryitemview.xml
index 8afdf2121..a2d8aaaf5 100644
--- a/AndorsTrail/res/layout/inventoryitemview.xml
+++ b/AndorsTrail/res/layout/inventoryitemview.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="@style/textWithIcon"
-    android:drawableLeft="@drawable/equip_weapon"
-    android:text="Name"
-    />
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	style="@style/textWithIcon"
+	android:drawableLeft="@drawable/equip_weapon"
+	android:text="Name"
+	/>
diff --git a/AndorsTrail/res/layout/itemeffectview.xml b/AndorsTrail/res/layout/itemeffectview.xml
index 3f08c32db..21f1f943e 100644
--- a/AndorsTrail/res/layout/itemeffectview.xml
+++ b/AndorsTrail/res/layout/itemeffectview.xml
@@ -5,30 +5,30 @@
 	android:layout_height="wrap_content"
 	>
 
-	<TextView 
-		android:text="@string/iteminfo_effect_works_when_equipped" 
-		android:id="@+id/itemeffect_onequip_title" 
+	<TextView
+		android:text="@string/iteminfo_effect_works_when_equipped"
+		android:id="@+id/itemeffect_onequip_title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
-		
+
 		<com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView
 			android:id="@+id/itemeffect_onequip_abilitymodifierinfo"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="10sp"
 			/>
-			
+
 		<com.gpl.rpg.AndorsTrail.view.ActorConditionEffectList
 			android:id="@+id/itemeffect_onequip_conditions"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="10sp"
 			/>
-	
-	<TextView 
-		android:text="@string/iteminfo_effect_works_when_used" 
-		android:id="@+id/itemeffect_onuse_title" 
+
+	<TextView
+		android:text="@string/iteminfo_effect_works_when_used"
+		android:id="@+id/itemeffect_onuse_title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
@@ -39,9 +39,9 @@
 			android:layout_marginLeft="10sp"
 			/>
 
-	<TextView 
-		android:text="@string/iteminfo_effect_works_when_hitting_target" 
-		android:id="@+id/itemeffect_onhit_title" 
+	<TextView
+		android:text="@string/iteminfo_effect_works_when_hitting_target"
+		android:id="@+id/itemeffect_onhit_title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
@@ -52,9 +52,9 @@
 			android:layout_marginLeft="10sp"
 			/>
 
-	<TextView 
-		android:text="@string/iteminfo_effect_works_when_killing_target" 
-		android:id="@+id/itemeffect_onkill_title" 
+	<TextView
+		android:text="@string/iteminfo_effect_works_when_killing_target"
+		android:id="@+id/itemeffect_onkill_title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
@@ -64,5 +64,5 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="10sp"
 			/>
-	
+
 </merge>
diff --git a/AndorsTrail/res/layout/itemeffectview_onuse.xml b/AndorsTrail/res/layout/itemeffectview_onuse.xml
index 608cc950e..be5a027bd 100644
--- a/AndorsTrail/res/layout/itemeffectview_onuse.xml
+++ b/AndorsTrail/res/layout/itemeffectview_onuse.xml
@@ -6,16 +6,16 @@
 	>
 
 	<LinearLayout
-		android:id="@+id/itemeffect_onuse_list" 
+		android:id="@+id/itemeffect_onuse_list"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
 		>
 	</LinearLayout>
-	
-	<TextView 
-		android:text="@string/iteminfo_effect_works_on_source" 
-		android:id="@+id/itemeffect_onuse_conditions_source_title" 
+
+	<TextView
+		android:text="@string/iteminfo_effect_works_on_source"
+		android:id="@+id/itemeffect_onuse_conditions_source_title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
@@ -25,10 +25,10 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="10sp"
 			/>
-		
-	<TextView 
-		android:text="@string/iteminfo_effect_works_on_target" 
-		android:id="@+id/itemeffect_onuse_conditions_target_title" 
+
+	<TextView
+		android:text="@string/iteminfo_effect_works_on_target"
+		android:id="@+id/itemeffect_onuse_conditions_target_title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		/>
@@ -38,5 +38,5 @@
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="10sp"
 			/>
-	
+
 </merge>
diff --git a/AndorsTrail/res/layout/iteminfo.xml b/AndorsTrail/res/layout/iteminfo.xml
index 2155e2074..cbd52bb21 100644
--- a/AndorsTrail/res/layout/iteminfo.xml
+++ b/AndorsTrail/res/layout/iteminfo.xml
@@ -5,7 +5,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical"
 	>
-	
+
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -21,20 +21,20 @@
 				android:id="@+id/iteminfo_title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="@string/inventory_info" 
+				android:text="@string/inventory_info"
 				style="@style/titleWithIcon"
 				android:drawableLeft="@drawable/equip_weapon"
 				/>
 
-            <TextView
-                android:id="@+id/iteminfo_description"
-                android:textStyle="italic"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/section_margin"
-                />
-		
-			<TextView 
+			<TextView
+				android:id="@+id/iteminfo_description"
+				android:textStyle="italic"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="@dimen/section_margin"
+				/>
+
+			<TextView
 				android:id="@+id/iteminfo_displaytype"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -47,18 +47,18 @@
 				android:gravity="center_vertical"
 				android:layout_marginBottom="@dimen/section_margin"
 				>
-				<TextView 
-					android:text="@string/iteminfo_category" 
+				<TextView
+					android:text="@string/iteminfo_category"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					/>
-				<TextView 
+				<TextView
 					android:id="@+id/iteminfo_category"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					/>
 			</LinearLayout>
-			
+
 			<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
 				android:id="@+id/iteminfo_effects"
 				android:layout_width="match_parent"
@@ -68,28 +68,28 @@
 	</ScrollView>
 
 	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />  
-	
+	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		style="@android:style/ButtonBar"
 		>
-		<Button 
+		<Button
 			android:id="@+id/iteminfo_action"
 			android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:text="@string/iteminfo_action_use"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/iteminfo_action_use"
 			/>
-			
-		<Button 
+
+		<Button
 			android:id="@+id/iteminfo_close"
 			android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:text="@string/dialog_close"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/dialog_close"
 			/>
 	</LinearLayout>
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/levelup.xml b/AndorsTrail/res/layout/levelup.xml
index 25afe7ade..b0db784d1 100644
--- a/AndorsTrail/res/layout/levelup.xml
+++ b/AndorsTrail/res/layout/levelup.xml
@@ -11,23 +11,23 @@
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
 		>
-	
+
 		<TextView
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:id="@+id/levelup_title" 
-			android:text="@string/levelup_title" 
+			android:id="@+id/levelup_title"
+			android:text="@string/levelup_title"
 			style="@style/titleWithIcon"
 			android:drawableLeft="@drawable/char_hero"
 			/>
-		
-		<TextView 
+
+		<TextView
 			android:id="@+id/levelup_description"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:text="@string/levelup_description"
 			/>
-			
+
 		<Button
 			android:id="@+id/levelup_add_health"
 			android:layout_width="match_parent"
@@ -52,8 +52,8 @@
 			android:layout_height="wrap_content"
 			android:text="@string/levelup_add_blockchance"
 			/>
-		
-		<TextView 
+
+		<TextView
 			android:id="@+id/levelup_adds_new_skillpoint"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -63,8 +63,8 @@
 			/>
 
 		<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-		<ListView android:layout_width="match_parent" android:layout_height="1dp" />  
-	
+		<ListView android:layout_width="match_parent" android:layout_height="1dp" />
+
 	</LinearLayout>
 
 </ScrollView>
diff --git a/AndorsTrail/res/layout/loadsave.xml b/AndorsTrail/res/layout/loadsave.xml
index 4477a3f7a..e242f038b 100644
--- a/AndorsTrail/res/layout/loadsave.xml
+++ b/AndorsTrail/res/layout/loadsave.xml
@@ -6,22 +6,22 @@
 	android:padding="@dimen/dialog_margin"
 	android:orientation="vertical"
 	>
-	
+
 	<TextView
 		android:id="@+id/loadsave_title"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:text="@string/loadsave_title_save" 
+		android:text="@string/loadsave_title_save"
 		style="@style/titleWithIcon"
 		/>
 
-	<TextView 
+	<TextView
 		android:id="@+id/loadsave_description"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:text="@string/loadsave_selectslot"
 		/>
-		
+
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
 				android:text="@string/loadsave_save_to_new_slot"
 				/>
 		</LinearLayout>
-		
+
 	</ScrollView>
 
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/main.xml b/AndorsTrail/res/layout/main.xml
index 1c6030562..6bdb9929c 100644
--- a/AndorsTrail/res/layout/main.xml
+++ b/AndorsTrail/res/layout/main.xml
@@ -12,13 +12,13 @@
 		android:layout_alignParentBottom="true"
 		/>
 
-    <com.gpl.rpg.AndorsTrail.view.QuickitemView
-        android:id="@+id/main_quickitemview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/main_statusview"
-        android:visibility="gone"
-        />
+	<com.gpl.rpg.AndorsTrail.view.QuickitemView
+		android:id="@+id/main_quickitemview"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_above="@id/main_statusview"
+		android:visibility="gone"
+		/>
 
 	<com.gpl.rpg.AndorsTrail.view.CombatView
 		android:id="@+id/main_combatview"
@@ -27,7 +27,7 @@
 		android:layout_alignParentTop="true"
 		android:visibility="gone"
 		/>
-	
+
 	<com.gpl.rpg.AndorsTrail.view.ToolboxView
 		android:id="@+id/main_toolboxview"
 		android:layout_width="wrap_content"
@@ -44,8 +44,8 @@
 		android:layout_above="@id/main_statusview"
 		android:layout_alignParentTop="true"
 		/>
- 
-	<TextView 
+
+	<TextView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_below="@id/main_combatview"
@@ -62,8 +62,8 @@
 		android:shadowRadius="1"
 		android:shadowColor="#000"
 		/>
-	
-	<RelativeLayout 
+
+	<RelativeLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_above="@id/main_statusview"
diff --git a/AndorsTrail/res/layout/monsterencounter.xml b/AndorsTrail/res/layout/monsterencounter.xml
index 22430ded0..ec9fc214d 100644
--- a/AndorsTrail/res/layout/monsterencounter.xml
+++ b/AndorsTrail/res/layout/monsterencounter.xml
@@ -11,26 +11,26 @@
 		android:orientation="vertical"
 		android:padding="@dimen/dialog_margin"
 		>
-		
+
 		<TextView
 			android:id="@+id/monsterencounter_title"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/dialog_monsterencounter_title" 
+			android:text="@string/dialog_monsterencounter_title"
 			style="@style/titleWithIcon"
 			android:drawableLeft="@drawable/equip_weapon"
 			/>
-	
-		<TextView 
+
+		<TextView
 			android:id="@+id/monsterencounter_description"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:text="@string/dialog_monsterencounter_message" 
+			android:text="@string/dialog_monsterencounter_message"
 			/>
 	</LinearLayout>
-	
+
 	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />  
+	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -39,26 +39,26 @@
 		android:gravity="center_vertical"
 		style="@android:style/ButtonBar"
 		>
-		<Button 
+		<Button
 			android:id="@+id/monsterencounter_attack"
 			android:layout_width="match_parent"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_height="wrap_content"
 			android:text="@android:string/yes"
 			/>
-			
-		<Button 
+
+		<Button
 			android:id="@+id/monsterencounter_info"
 			android:layout_width="match_parent"
-            android:layout_weight="1"
+			android:layout_weight="1"
 			android:layout_height="wrap_content"
 			android:text="@string/dialog_monsterencounter_info"
 			/>
-			
-		<Button 
+
+		<Button
 			android:id="@+id/monsterencounter_cancel"
 			android:layout_width="match_parent"
-            android:layout_weight="1"
+			android:layout_weight="1"
 			android:layout_height="wrap_content"
 			android:text="@android:string/no"
 			/>
diff --git a/AndorsTrail/res/layout/monsterinfo.xml b/AndorsTrail/res/layout/monsterinfo.xml
index 710ebc891..22d19fd14 100644
--- a/AndorsTrail/res/layout/monsterinfo.xml
+++ b/AndorsTrail/res/layout/monsterinfo.xml
@@ -5,7 +5,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical"
 	>
-	
+
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -18,61 +18,61 @@
 			android:padding="@dimen/dialog_margin"
 			android:id="@+id/monsterinfo_container"
 			>
-			
+
 			<TextView
 				android:id="@+id/monsterinfo_title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="@string/dialog_monsterencounter_info" 
+				android:text="@string/dialog_monsterencounter_info"
 				style="@style/titleWithIcon"
 				android:drawableLeft="@drawable/char_hero"
 				/>
-			
+
 			<LinearLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:orientation="horizontal"
 				android:layout_marginBottom="@dimen/section_margin"
 				>
-				<TextView 
-				    android:text="@string/actorinfo_difficulty" 
-				    android:layout_marginRight="10sp"
+				<TextView
+					android:text="@string/actorinfo_difficulty"
+					android:layout_marginRight="10sp"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					/>
-				<TextView 
-				    android:id="@+id/monsterinfo_difficulty"
-				    android:text="@string/monster_difficulty_normal" 
+				<TextView
+					android:id="@+id/monsterinfo_difficulty"
+					android:text="@string/monster_difficulty_normal"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-				    />
+					/>
 			</LinearLayout>
-	
+
 			<com.gpl.rpg.AndorsTrail.view.RangeBar
 				android:id="@+id/monsterinfo_healthbar"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="@dimen/section_margin"
 				/>
-			
+
 			<TableLayout
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:id="@+id/actorinfo_stats_table"
 				>
-                <TableRow>
+				<TableRow>
 					<TextView style="@style/traitsinfo_label" android:text="@string/traitsinfo_base_max_ap" />
 					<TextView android:id="@+id/monsterinfo_max_ap" />
 				</TableRow>
 				<include layout="@layout/traitsinfoview" />
 			</TableLayout>
-			
+
 			<com.gpl.rpg.AndorsTrail.view.ItemEffectsView
 				android:id="@+id/actorinfo_onhiteffects"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				/>
-			
+
 			<TextView
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
@@ -85,25 +85,25 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				/>
-			
+
 		</LinearLayout>
 	</ScrollView>
-	
+
 	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />  
-	
+	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		style="@android:style/ButtonBar"
 		>
-		<Button 
+		<Button
 			android:id="@+id/monsterinfo_close"
 			android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:text="@string/dialog_close"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/dialog_close"
 			/>
 	</LinearLayout>
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/questlog.xml b/AndorsTrail/res/layout/questlog.xml
index c89da019d..da31d00ae 100644
--- a/AndorsTrail/res/layout/questlog.xml
+++ b/AndorsTrail/res/layout/questlog.xml
@@ -6,14 +6,14 @@
 	android:padding="@dimen/dialog_margin"
 	android:orientation="vertical"
 	>
-	
-	<Spinner 
+
+	<Spinner
 		android:id="@+id/questlog_includecompleted"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:prompt="@string/questlog_includecompleted_prompt"
 		/>
-	
+
 	<ExpandableListView
 		android:id="@+id/questlog_contents"
 		android:layout_width="match_parent"
diff --git a/AndorsTrail/res/layout/rangebar.xml b/AndorsTrail/res/layout/rangebar.xml
index 6bcbe58b2..45706aed4 100644
--- a/AndorsTrail/res/layout/rangebar.xml
+++ b/AndorsTrail/res/layout/rangebar.xml
@@ -4,7 +4,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	>
-	<TextView 
+	<TextView
 		android:id="@+id/rangebar_label"
 		android:layout_width="30sp"
 		android:layout_height="wrap_content"
@@ -15,17 +15,17 @@
 		android:shadowRadius="1"
 		android:shadowColor="#000"
 		/>
-			
+
 	<ProgressBar android:id="@+id/rangebar_progress"
 		style="?android:attr/progressBarStyleHorizontal"
-       	android:progressDrawable="@drawable/ui_progress_health"
+		android:progressDrawable="@drawable/ui_progress_health"
 		android:layout_width="match_parent"
 		android:layout_height="@dimen/healthbar_height"
 		android:layout_toRightOf="@id/rangebar_label"
 		android:layout_centerVertical="true"
 		android:layout_marginRight="3sp"
 		/>
-	
+
 	<TextView android:id="@+id/rangebar_text"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
diff --git a/AndorsTrail/res/layout/shoplist.xml b/AndorsTrail/res/layout/shoplist.xml
index f84760c49..2b871b54f 100644
--- a/AndorsTrail/res/layout/shoplist.xml
+++ b/AndorsTrail/res/layout/shoplist.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:gravity="left"
-    >
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	android:gravity="left"
+	>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/shop_gc"
-        android:drawableLeft="@drawable/ui_icon_coins"
-        android:drawablePadding="@dimen/boxshape_margin"
-        android:layout_gravity="right"
-        android:gravity="center_vertical"
-        />
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/shop_gc"
+		android:drawableLeft="@drawable/ui_icon_coins"
+		android:drawablePadding="@dimen/boxshape_margin"
+		android:layout_gravity="right"
+		android:gravity="center_vertical"
+		/>
 
-    <ListView
-        android:id="@+id/shop_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        />
+	<ListView
+		android:id="@+id/shop_list"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		/>
 
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/skill_info_view.xml b/AndorsTrail/res/layout/skill_info_view.xml
index b75f31fce..582f6f8e5 100644
--- a/AndorsTrail/res/layout/skill_info_view.xml
+++ b/AndorsTrail/res/layout/skill_info_view.xml
@@ -5,7 +5,7 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical"
 	>
-	
+
 	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -21,63 +21,63 @@
 				android:id="@+id/skillinfo_title"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:text="@string/heroinfo_skill" 
+				android:text="@string/heroinfo_skill"
 				style="@style/titleWithIcon"
 				android:drawableLeft="@drawable/ui_icon_skill"
 				/>
-		
-			<TextView 
-				android:text="@string/skill_current_level" 
+
+			<TextView
+				android:text="@string/skill_current_level"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_gravity="right"
 				android:id="@+id/skillinfo_currentlevel"
 				android:layout_marginBottom="@dimen/section_margin"
 				/>
-			
-			<TextView 
-				android:text="@string/skill_longdescription_weapon_chance" 
+
+			<TextView
+				android:text="@string/skill_longdescription_weapon_chance"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:id="@+id/skillinfo_longdescription"
 				android:layout_marginBottom="@dimen/section_margin"
 				/>
-			
-			<TextView 
-				android:text="@string/skill_prerequisite_other_skill" 
+
+			<TextView
+				android:text="@string/skill_prerequisite_other_skill"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:id="@+id/skillinfo_requirement"
 				android:layout_marginBottom="@dimen/section_margin"
 				/>
-			
+
 		</LinearLayout>
-		
+
 	</ScrollView>
 
 	<!-- Workaround http://code.google.com/p/andors-trail/issues/detail?id=242 -->
-	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />  
-	
+	<ListView android:layout_width="match_parent" android:layout_height="wrap_content" />
+
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		style="@android:style/ButtonBar"
 		>
-		<Button 
+		<Button
 			android:id="@+id/skillinfoinfo_action"
 			android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:text="@string/skillinfo_action_levelup"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/skillinfo_action_levelup"
 			/>
-			
-		<Button 
+
+		<Button
 			android:id="@+id/skillinfoinfo_close"
 			android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-	        android:layout_weight="1"
-	        android:text="@string/dialog_close"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:text="@string/dialog_close"
 			/>
 	</LinearLayout>
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/skill_listentry_view.xml b/AndorsTrail/res/layout/skill_listentry_view.xml
index 72c07d4dc..a37974346 100644
--- a/AndorsTrail/res/layout/skill_listentry_view.xml
+++ b/AndorsTrail/res/layout/skill_listentry_view.xml
@@ -5,32 +5,32 @@
 	android:layout_height="wrap_content"
 	>
 	<ImageView
-        android:id="@+id/skillentry_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="6dip"
-        android:layout_alignParentLeft="true"
-        android:layout_centerVertical="true"
-        android:src="@drawable/ui_icon_skill"
+		android:id="@+id/skillentry_icon"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginRight="6dip"
+		android:layout_alignParentLeft="true"
+		android:layout_centerVertical="true"
+		android:src="@drawable/ui_icon_skill"
 		/>
 
 	<TextView
 		android:id="@+id/skillentry_title"
-        android:layout_width="match_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_toRightOf="@id/skillentry_icon"
-        android:layout_alignParentTop="true"
-        android:text="@string/skill_title_weapon_chance"
+		android:layout_alignParentTop="true"
+		android:text="@string/skill_title_weapon_chance"
 		android:textSize="22sp"
 		/>
 
 	<TextView
 		android:id="@+id/skillentry_description"
-        android:layout_width="match_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_toRightOf="@id/skillentry_icon"
-        android:layout_below="@id/skillentry_title"
-        android:text="@string/skill_shortdescription_weapon_chance"
+		android:layout_below="@id/skillentry_title"
+		android:text="@string/skill_shortdescription_weapon_chance"
 		/>
 
 </RelativeLayout>
diff --git a/AndorsTrail/res/layout/startscreen.xml b/AndorsTrail/res/layout/startscreen.xml
index 530b71bb3..0940a6b97 100644
--- a/AndorsTrail/res/layout/startscreen.xml
+++ b/AndorsTrail/res/layout/startscreen.xml
@@ -38,7 +38,7 @@
 				android:visibility="gone"
 				android:inputType="textPersonName"
 				/>
-				
+
 			<TextView
 				android:id="@+id/startscreen_dev_version"
 				android:layout_width="wrap_content"
@@ -67,7 +67,7 @@
 		android:layout_height="wrap_content"
 		android:text="@string/startscreen_continue"
 		/>
-		
+
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
@@ -89,20 +89,20 @@
 			android:text="@string/startscreen_load"
 			/>
 	</LinearLayout>
-		
+
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:orientation="horizontal"
 		android:gravity="center_vertical"
 		>
-        <Button
-            android:id="@+id/startscreen_preferences"
-            android:layout_width="0dip"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:text="@string/menu_settings"
-            />
+		<Button
+			android:id="@+id/startscreen_preferences"
+			android:layout_width="0dip"
+			android:layout_weight="1"
+			android:layout_height="wrap_content"
+			android:text="@string/menu_settings"
+			/>
 		<Button
 			android:id="@+id/startscreen_about"
 			android:layout_width="0dip"
diff --git a/AndorsTrail/res/layout/statusview.xml b/AndorsTrail/res/layout/statusview.xml
index 37cc3694a..8c988ea79 100644
--- a/AndorsTrail/res/layout/statusview.xml
+++ b/AndorsTrail/res/layout/statusview.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge 
+<merge
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	>
 
-	<ImageButton 
+	<ImageButton
 		android:id="@+id/status_image"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -13,21 +13,21 @@
 		android:layout_centerVertical="true"
 		android:layout_margin="3sp"
 		/>
-		
-    <ImageButton 
-        android:id="@+id/toolbox_toggle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true"
-        />
+
+	<ImageButton
+		android:id="@+id/toolbox_toggle"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_alignParentRight="true"
+		android:layout_centerVertical="true"
+		/>
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
+		android:layout_centerVertical="true"
 		android:layout_toRightOf="@id/status_image"
-        android:layout_toLeftOf="@id/toolbox_toggle"
+		android:layout_toLeftOf="@id/toolbox_toggle"
 		android:orientation="vertical"
 		>
 		<com.gpl.rpg.AndorsTrail.view.RangeBar
@@ -41,5 +41,5 @@
 			android:layout_height="wrap_content"
 			/>
 	</LinearLayout>
-	
+
 </merge>
\ No newline at end of file
diff --git a/AndorsTrail/res/layout/tabbedlayout.xml b/AndorsTrail/res/layout/tabbedlayout.xml
index 0f2cdb634..bf05bd564 100644
--- a/AndorsTrail/res/layout/tabbedlayout.xml
+++ b/AndorsTrail/res/layout/tabbedlayout.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.app.FragmentTabHost
 	xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/tabhost"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="5dp"
-        >
+	android:id="@android:id/tabhost"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	>
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:padding="5dp"
+		>
 
-        <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:visibility="gone"
-                />
+		<TabWidget
+				android:id="@android:id/tabs"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_weight="0"
+				android:visibility="gone"
+				/>
 
-        <FrameLayout
-                android:id="@android:id/tabcontent"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="0"/>
+		<FrameLayout
+				android:id="@android:id/tabcontent"
+				android:layout_width="0dp"
+				android:layout_height="0dp"
+				android:layout_weight="0"/>
 
-        <FrameLayout
-                android:id="@+id/realtabcontent"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"/>
+		<FrameLayout
+				android:id="@+id/realtabcontent"
+				android:layout_width="match_parent"
+				android:layout_height="0dp"
+				android:layout_weight="1"/>
 
 	</LinearLayout>
 </android.support.v4.app.FragmentTabHost>
diff --git a/AndorsTrail/res/layout/toolboxview.xml b/AndorsTrail/res/layout/toolboxview.xml
index e90142bd6..bdbf913d9 100644
--- a/AndorsTrail/res/layout/toolboxview.xml
+++ b/AndorsTrail/res/layout/toolboxview.xml
@@ -7,24 +7,24 @@
 	android:background="@drawable/ui_gradientshape"
 	>
 
-    <ImageButton
-        android:id="@+id/toolbox_save"
-        style="@style/toolboxButtonTile"
-        android:src="@drawable/ui_icon_save"
-        />
-    <ImageButton
-        android:id="@+id/toolbox_combatlog"
-        style="@style/toolboxButtonTile"
-        android:src="@drawable/ui_icon_combat"
-        />
+	<ImageButton
+		android:id="@+id/toolbox_save"
+		style="@style/toolboxButtonTile"
+		android:src="@drawable/ui_icon_save"
+		/>
+	<ImageButton
+		android:id="@+id/toolbox_combatlog"
+		style="@style/toolboxButtonTile"
+		android:src="@drawable/ui_icon_combat"
+		/>
 	<ImageButton
 		android:id="@+id/toolbox_map"
 		style="@style/toolboxButtonTile"
 		android:src="@drawable/ui_icon_map"
-	    />
-	<ImageButton 
-	    android:id="@+id/toolbox_quickitems"
+		/>
+	<ImageButton
+		android:id="@+id/toolbox_quickitems"
 		style="@style/toolboxButtonTile"
 		android:src="@drawable/ui_icon_equipment"
-	    />
+		/>
 </LinearLayout>
diff --git a/AndorsTrail/res/layout/traitsinfoview.xml b/AndorsTrail/res/layout/traitsinfoview.xml
index e3c869792..a20f86132 100644
--- a/AndorsTrail/res/layout/traitsinfoview.xml
+++ b/AndorsTrail/res/layout/traitsinfoview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
 	>
 	<TableRow>
 		<TextView style="@style/traitsinfo_label" android:text="@string/actorinfo_movecost" />
diff --git a/AndorsTrail/res/values-de/strings.xml b/AndorsTrail/res/values-de/strings.xml
index 0b83d222e..624f6e0e3 100644
--- a/AndorsTrail/res/values-de/strings.xml
+++ b/AndorsTrail/res/values-de/strings.xml
@@ -3,7 +3,7 @@
 <resources>
 	<string name="app_name">Andor\'s Trail</string>
 	<string name="app_description">Questgetriebenes Fantasy-Rollenspiel</string>
-	
+
 	<string name="exit">Beenden</string>
 	<string name="exit_to_menu">Zum Menü</string>
 	<string name="menu_pause">Pause</string>
@@ -18,17 +18,17 @@
 	<string name="loadsave_selectslot">Speicherplatz wählen</string>
 	<string name="loadsave_slot_empty">(leer)</string>
 	<string name="savegame_currenthero_displayinfo">Level %1$d, %2$d Erfahrung, %3$d Goldmünzen</string>
-	
+
 	<string name="dialog_loading_message">Lade Ressourcen...</string>
 	<string name="dialog_loading_failed_title">Laden fehlgeschlagen</string>
 	<string name="dialog_loading_failed_message">Der Spielstand konnte nicht geladen werden.\n\n:(\n\nDie Datei könnte beschädigt oder unvollständig sein.</string>
 	<string name="dialog_loading_failed_incorrectversion">Der Spielstand konnte nicht geladen werden. Die Datei wurde mit einer neueren Programmversion erstellt.</string>
-	
+
 	<string name="dialog_close">Schließen</string>
-	
+
 	<string name="dialog_confirmexit_title">Beenden</string>
 	<string name="dialog_confirmexit_message">Sind sie sicher, dass sie das Programm beenden möchten?</string>
-	
+
 	<string name="dialog_paused_title">Pausiert</string>
 	<string name="dialog_paused_message">Das Spiel wurde unterbrochen</string>
 	<string name="dialog_paused_resume">Weiterspielen</string>
@@ -55,7 +55,7 @@
 	<string name="heroinfo_gold">Gold: %1$d</string>
 	<string name="heroinfo_actionpoints">Aktionspunkte (AP):</string>
 	<string name="heroinfo_quests">Quests</string>
-	
+
 	<string name="combat_attack">Angriff (%1$d AP)</string>
 	<string name="combat_move">Bewegung (%1$d AP)</string>
 	<string name="combat_use">Benutzen</string>
@@ -68,7 +68,7 @@
 	<string name="combat_status_ap">AP: %1$d</string>
 	<string name="combat_monsterhealth">LP:</string>
 	<string name="combat_monsteraction">%1$s greift an.</string>
-	<!-- <string name="combat_cannotexitcombat">Du kannst den Kampf nicht verlassen, weil noch Gegner in der Nähe sind. Du musst dich zunächst auf ein Feld bewegen, wo dich die Gegner nicht mehr erreichen können.</string>  -->
+	<!-- <string name="combat_cannotexitcombat">Du kannst den Kampf nicht verlassen, weil noch Gegner in der Nähe sind. Du musst dich zunächst auf ein Feld bewegen, wo dich die Gegner nicht mehr erreichen können.</string> -->
 	<string name="combat_result_monstermiss">%1$s verfehlt!</string>
 	<string name="combat_result_monsterhit">%1$s trifft dich und nimmt dir %2$d LP!</string>
 	<string name="combat_result_monsterhitcritical">%1$s macht einen kritischen Treffer (%2$d LP)!</string>
@@ -78,7 +78,7 @@
 	<string name="combat_result_herokillsmonster">%1$s ist besiegt!</string>
 	<string name="combat_not_enough_ap">Es sind nicht mehr genug AP in dieser Runde übrig.</string>
 	<string name="combat_hero_dies">Du wirst bewusstlos, wachst aber glücklicherweise wieder lebendig, benommen und entkräftet auf. Du verlierst %1$d Erfahrungspunkte.</string>
-		
+
 	<string name="inventory_info">Info</string>
 	<string name="inventory_equip">Anlegen</string>
 	<string name="inventory_unequip">Ablegen</string>
@@ -97,35 +97,35 @@
 	<string name="dialog_monsterloot_title">Sieg</string>
 	<string name="dialog_monsterloot_message">Du hast den Kampf überlebt. </string>
 	<string name="dialog_monsterloot_gainedexp">Du erhältst %1$d Erfahrung. </string>
-    
-    <string name="monster_difficulty_veryeasy">Sehr leicht</string>
-    <string name="monster_difficulty_easy">Leicht</string>
-    <string name="monster_difficulty_normal">Normal</string>
-    <string name="monster_difficulty_hard">Schwer</string>
-    <string name="monster_difficulty_veryhard">Sehr schwer</string>
-    <string name="monster_difficulty_impossible">Unmöglich</string>
 
-    <string name="actorinfo_class">Klasse:</string>
-    <string name="actorinfo_difficulty">Schwierigkeit:</string>
-    <string name="actorinfo_health">Lebenspunkte:</string>
-    <string name="actorinfo_attacksperturn">Angriffe/Runde:</string>
-    <string name="actorinfo_movesperturn">Bewegungen/Runde:</string>
-    <string name="actorinfo_attack">Angriff:</string>
-    <string name="actorinfo_criticalhit">Krit. Treffer:</string>
-    <string name="actorinfo_defense">Abwehr:</string>
-    <string name="actorinfo_movecost">Bewegungskosten (AP):</string>
-    <string name="actorinfo_basetraits">Basiskampfeigenschaften (ohne Ausrüstung und Skills)</string>
-    <string name="actorinfo_currenttraits">Kampfeigenschaften (aktuell)</string>
-    
-    <string name="traitsinfo_attack_cost">Angriffskosten (AP):</string>
-    <string name="traitsinfo_attack_chance">Angriffschance:</string>
-    <string name="traitsinfo_attack_damage">Schaden:</string>
-    <string name="traitsinfo_criticalhit_skill">Kritische Fähigkeit:</string>
-    <string name="traitsinfo_criticalhit_multiplier">Faktor bei krit. Treffern:</string>
-    <string name="traitsinfo_defense_chance">Abwehrchance:</string>
-    <string name="traitsinfo_defense_damageresist">Schadensresistenz:</string>
-    
-	<!-- <string name="key_required">Hier kommt man nur mit einem bestimmten Schlüssel weiter.</string>  -->
+	<string name="monster_difficulty_veryeasy">Sehr leicht</string>
+	<string name="monster_difficulty_easy">Leicht</string>
+	<string name="monster_difficulty_normal">Normal</string>
+	<string name="monster_difficulty_hard">Schwer</string>
+	<string name="monster_difficulty_veryhard">Sehr schwer</string>
+	<string name="monster_difficulty_impossible">Unmöglich</string>
+
+	<string name="actorinfo_class">Klasse:</string>
+	<string name="actorinfo_difficulty">Schwierigkeit:</string>
+	<string name="actorinfo_health">Lebenspunkte:</string>
+	<string name="actorinfo_attacksperturn">Angriffe/Runde:</string>
+	<string name="actorinfo_movesperturn">Bewegungen/Runde:</string>
+	<string name="actorinfo_attack">Angriff:</string>
+	<string name="actorinfo_criticalhit">Krit. Treffer:</string>
+	<string name="actorinfo_defense">Abwehr:</string>
+	<string name="actorinfo_movecost">Bewegungskosten (AP):</string>
+	<string name="actorinfo_basetraits">Basiskampfeigenschaften (ohne Ausrüstung und Skills)</string>
+	<string name="actorinfo_currenttraits">Kampfeigenschaften (aktuell)</string>
+
+	<string name="traitsinfo_attack_cost">Angriffskosten (AP):</string>
+	<string name="traitsinfo_attack_chance">Angriffschance:</string>
+	<string name="traitsinfo_attack_damage">Schaden:</string>
+	<string name="traitsinfo_criticalhit_skill">Kritische Fähigkeit:</string>
+	<string name="traitsinfo_criticalhit_multiplier">Faktor bei krit. Treffern:</string>
+	<string name="traitsinfo_defense_chance">Abwehrchance:</string>
+	<string name="traitsinfo_defense_damageresist">Schadensresistenz:</string>
+
+	<!-- <string name="key_required">Hier kommt man nur mit einem bestimmten Schlüssel weiter.</string> -->
 
 	<string name="iteminfo_category">Kategorie: </string>
 	<string name="iteminfo_action_use">Benutzen</string>
@@ -146,15 +146,15 @@
 	<string name="itemcategory_wearable_ring">Ringe</string>
 	<string name="itemcategory_potion">Tränke</string>
 	<string name="itemcategory_other">Sonstiges</string>
-	
+
 	<string name="startscreen_continue">Aktuelles Spiel fortsetzen</string>
 	<string name="startscreen_newgame">Neues Spiel</string>
 	<string name="startscreen_newgame_confirm">Das aktuelle Spiel wird verworfen. Sind sie sicher, dass sie ein neues Spiel starten wollen?</string>
 	<string name="startscreen_about">Über/Hilfe</string>
 	<string name="startscreen_enterheroname">Heldennamen eingeben</string>
 	<string name="startscreen_load">Laden</string>
-	
-	<!-- <string name="conversation_title">%1$s sagt</string>  -->
+
+	<!-- <string name="conversation_title">%1$s sagt</string> -->
 	<string name="conversation_rewardexp"> [Du erhältst %1$d Erfahrung]</string>
 	<string name="conversation_rewardgold"> [Du erhältst %1$d Goldmünzen]</string>
 	<string name="conversation_lostgold"> [Du verlierst %1$d Goldmünzen]</string>
@@ -162,7 +162,7 @@
 	<string name="conversation_rewarditems"> [Du erhältst %1$d Gegenstände]</string>
 	<string name="conversation_next">Weiter</string>
 	<string name="conversation_leave">Verlassen</string>
-	
+
 	<string name="shop_buy">Kaufen</string>
 	<string name="shop_sell">Verkaufen</string>
 	<string name="shop_infoitem">Info</string>
@@ -171,7 +171,7 @@
 	<string name="shop_yourgold">Deine Goldmünzen: %1$d</string>
 	<string name="shop_item_bought">%1$s gekauft.</string>
 	<string name="shop_item_sold">%1$s verkauft.</string>
-	
+
 	<string name="levelup_title">Aufsteigen</string>
 	<string name="levelup_description">Du hast Level %1$d erreicht!</string>
 	<string name="levelup_buttontext">Aufsteigen</string>
@@ -183,7 +183,7 @@
 	<string name="levelup_add_attackdamage_description">Fügt %1$d zum Basis-Angriffsschaden hinzu.</string>
 	<string name="levelup_add_blockchance">Abwehrchance erhöhen (+%1$d %%)</string>
 	<string name="levelup_add_blockchance_description">Fügt %1$d%% zur Basis-Abwehrchance hinzu.</string>
-	
+
 	<string name="dialog_rest_title">Schlafen</string>
 	<string name="dialog_rest_confirm_message">Willst du dich hier ausruhen?</string>
 	<string name="dialog_rest_message">Der Schlaf hat dich erfrischt und deine Gesundheit wieder hergestellt.</string>
@@ -203,10 +203,10 @@
 		Bitte besuchen sie uns im Forum, um das Spiel mit anderen Spielern zu diskutieren.&lt;br /&gt;
 	</string>
 
-	<!-- 
-		This is the GNU GPL v2 text, originally from 
+	<!--
+		This is the GNU GPL v2 text, originally from
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-		For translation of this text, you might be able to find a version in your language here: 
+		For translation of this text, you might be able to find a version in your language here:
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
 	-->
 	<string name="about_contents3">
@@ -218,16 +218,16 @@
 		&lt;br /&gt;
 		Für den Quelltext und Verbesserungsanfragen, besuchen Sie bitte die Projektseite:&lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
 	</string>
-	
+
 	<string name="dialog_newversion_title">Willkommen</string>
 	<string name="dialog_newversion_message">
-        Vielen Dank, dass Du Andor\'s Trail heruntergeladen hast!\n\n
-        Bedenke bitte, dass diese Version von Andor\'s Trail noch IN DER ENTWICKLUNG ist und somit noch nicht alle Karten komplett fertig sind.\n
-        Bitte besuche das Projekt-Forum für weitere Informationen oder wenn du mithelfen willst (siehe "Über").\n
-        \n
-        Danke für alle bisherigen Rückmeldungen!
+		Vielen Dank, dass Du Andor\'s Trail heruntergeladen hast!\n\n
+		Bedenke bitte, dass diese Version von Andor\'s Trail noch IN DER ENTWICKLUNG ist und somit noch nicht alle Karten komplett fertig sind.\n
+		Bitte besuche das Projekt-Forum für weitere Informationen oder wenn du mithelfen willst (siehe "Über").\n
+		\n
+		Danke für alle bisherigen Rückmeldungen!
 	</string>
-	
+
 	<string name="questlog_title">Quests</string>
 	<string name="questlog_includecompleted_prompt">Welche Quests anzeigen?</string>
 	<string name="questlog_includecompleted_hidecompleted">Verstecke abgeschlossene Quests</string>
@@ -236,7 +236,7 @@
 	<string name="questlog_queststatus">Status: %1$s</string>
 	<string name="questlog_queststatus_inprogress">Offen</string>
 	<string name="questlog_queststatus_completed">Abgeschlossen</string>
-	
+
 	<string name="preferences_display_category">Anzeige</string>
 	<string name="preferences_display_fullscreen_title">Vollbild</string>
 	<string name="preferences_display_fullscreen">Zeigt das Spiel im Vollbildmodus an. (erfordert Neustart)</string>
@@ -258,7 +258,7 @@
 	<string name="preferences_attackspeed_fast">Schnell</string>
 	<string name="preferences_attackspeed_normal">Normal</string>
 	<string name="preferences_attackspeed_slow">Langsam</string>
-	
+
 	<string name="preferences_movement_category">Bewegung</string>
 	<string name="preferences_movementmethod_title">Bewegungsmethode</string>
 	<string name="preferences_movementmethod">Methode für die Fortbewegung und Behandlung von Hindernissen.</string>
@@ -280,39 +280,39 @@
 	<string name="iteminfo_effect_works_when_killing_target">bei jedem besiegten Gegner</string>
 	<string name="iteminfo_effect_works_when_used">bei Anwendung</string>
 	<string name="iteminfo_effect_works_when_equipped">solange angelegt</string>
-	
+
 	<string name="iteminfo_effect_decrease_current_hp">entzieht %1$s LP</string>
 	<string name="iteminfo_effect_increase_current_hp">gibt %1$s LP zurück</string>
 	<string name="iteminfo_effect_decrease_current_ap">entzieht %1$s AP</string>
 	<string name="iteminfo_effect_increase_current_ap">gibt %1$s AP zurück</string>
-	
+
 	<string name="iteminfo_effect_increase_max_hp">erhöht max. LP +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_hp">verringert max. LP um %1$d</string>
 	<string name="iteminfo_effect_increase_max_ap">erhöht max. AP +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_ap">verringert max. AP um %1$d</string>
 	<string name="iteminfo_effect_increase_movecost">Bewegungsstrafe +%1$d AP</string>
 	<string name="iteminfo_effect_decrease_movecost">Bewegungsbonus %1$d AP</string>
-	
+
 	<string name="preferences_display_scaling_factor_title">Skalierung</string>
 	<string name="preferences_display_scaling_factor">Vergrößert die Darstellung.</string>
 	<string name="preferences_display_scaling_factor_normal">Normalgröße</string>
 	<string name="preferences_display_scaling_factor_50_percent_larger">1,5-fache Größe</string>
 	<string name="preferences_display_scaling_factor_double">Doppelte Größe</string>
-	
+
 	<string name="inventory_assign">Quickslot zuweisen</string>
 	<string name="inventory_assign_slot1">Quickslot 1</string>
 	<string name="inventory_assign_slot2">Quickslot 2</string>
 	<string name="inventory_assign_slot3">Quickslot 3</string>
 	<string name="inventory_unassign">Quickslot aufheben</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.6.10 -->
-	
+
 	<string name="preferences_movement_dpad_position_title">virtuelles D-Pad</string>
 	<string name="preferences_movement_dpad_position">Aktiviert ein virtuelles D-Pad auf dem Bildschirm zur Steuerung.</string>
 	<string name="preferences_movement_dpad_minimizeable_title">Minimierbares D-Pad</string>
 	<string name="preferences_movement_dpad_minimizeable">Wenn das virtuelle D-Pad aktiviert ist, erlaubt diese Einstellung die Minimierung des D-Pads durch einen Klick auf die Mitte.</string>
-	
+
 	<string name="preferences_movement_dpad_positions_disabled">Deaktiviert</string>
 	<string name="preferences_movement_dpad_positions_lower_right">Untere rechte Ecke</string>
 	<string name="preferences_movement_dpad_positions_lower_left">Untere linke Ecke</string>
@@ -322,7 +322,7 @@
 	<string name="preferences_movement_dpad_positions_upper_left">Obere linke Ecke</string>
 	<string name="preferences_movement_dpad_positions_upper_right">Obere rechte Ecke</string>
 	<string name="preferences_movement_dpad_positions_center_top">Oben in der Mitte</string>
-	
+
 	<string name="actorconditioninfo_constant_effect">andauernder Effekt</string>
 	<string name="actorconditioninfo_effect_every_round">Jede Runde</string>
 	<string name="actorconditioninfo_effect_every_full_round">Jede volle Runde</string>
@@ -331,146 +331,146 @@
 	<string name="bulkselection_select_all">Alles</string>
 	<string name="bulkselection_sell_confirmation_title">Wirklich verkaufen?</string>
 	<string name="bulkselection_sell_confirmation">Soll %1$s wirklich verkauft werden? Dieser Gegenstand ist %2$s und du könntest ihn nicht zurückerlangen können.</string>
-	
-    <string name="skill_title_weapon_chance">Waffen Präzision</string>
-    <string name="skill_title_weapon_dmg">Kräftiger Schlag</string>
-    <string name="skill_title_barter">Kaufmann</string>
-    <string name="skill_title_dodge">Ausweichen</string>
-    <string name="skill_title_barkskin">Rindenhaut</string>
-    <string name="skill_title_more_criticals">Mehr kritischer Schaden</string>
-    <string name="skill_title_better_criticals">Besserer kritischer Schaden</string>
-    <string name="skill_title_speed">Kampfgeschwindigkeit</string>
-    <string name="skill_title_coinfinder">Schatzjäger</string>
-    <string name="skill_title_more_exp">Guter Lehrling</string>
-    <string name="skill_title_cleave">Cleave</string>
-    <string name="skill_title_eater">Leichenesser</string>
-    <string name="skill_title_fortitude">wachsende Standhaftigkeit</string>
-    <string name="skill_title_evasion">Umgehen</string>
-    <string name="skill_title_regeneration">Regeneration</string>
-    <string name="skill_title_lower_exploss">Fehlschläge meistern</string>
-    <string name="skill_title_magicfinder">Magischer Schatzsucher</string>
-    <string name="skill_title_resistance_mental">Starker Verstand</string>
-    <string name="skill_title_resistance_physical_capacity">Ausdauernder Körper</string>
-    <string name="skill_title_resistance_blood_disorder">Reines Blut</string>
-    
-    <string name="skill_shortdescription_weapon_chance">Erhöhte Angriffschance</string>
-    <string name="skill_shortdescription_weapon_dmg">Erhöhter Angriffsschaden</string>
-    <string name="skill_shortdescription_barter">Bessere Händlerpreise</string>
-    <string name="skill_shortdescription_dodge">Erhöhte Abwehrchance</string>
-    <string name="skill_shortdescription_barkskin">Schadensresistenz</string>
-    <string name="skill_shortdescription_more_criticals">Erhöhte kritische Fähigkeit</string>
-    <string name="skill_shortdescription_better_criticals">Erhöhter kritischer Schaden</string>
-    <string name="skill_shortdescription_speed">Erhöhte maximale Aktionspunkte</string>
-    <string name="skill_shortdescription_coinfinder">Größere Chance Goldmünzen zu finden</string>
-    <string name="skill_shortdescription_more_exp">Größere Erfahrung von Gegnern</string>
-    <string name="skill_shortdescription_cleave">Regeneriere Aktionspunkte von besiegten Gegnern</string>
-    <string name="skill_shortdescription_eater">Regeneriere Lebenspunkte von besiegten Gegnern</string>
-    <string name="skill_shortdescription_fortitude">Erlange Leben bei jedem Aufstieg</string>
-    <string name="skill_shortdescription_evasion">Erhöhte Chance zu Fliehen</string>
-    <string name="skill_shortdescription_regeneration">Regeneriere jede Runde Lebenspunkte</string>
-    <string name="skill_shortdescription_lower_exploss">Verringere den Verlust an Erfahrungspunkten beim Sterben</string>
-    <string name="skill_shortdescription_magicfinder">Größere Chance magische Gegenstände zu finden</string>
-    <string name="skill_shortdescription_resistance_mental">Widerstand gegen mentale Effekte</string>
-    <string name="skill_shortdescription_resistance_physical_capacity">Widerstand gegen physische Effekte</string>
-    <string name="skill_shortdescription_resistance_blood_disorder">Widerstand gegen Blutstörungen</string>
-    
-    <string name="skill_longdescription_weapon_chance">Erhöht die Angriffschance bei jeder Stufe um %1$d.</string>
-    <string name="skill_longdescription_weapon_dmg">Erhöht den minimalen und maximalen Schaden bei jeder Stufe um %1$d.</string>
-    <string name="skill_longdescription_barter">Verringert bei jeder Stufe den Auf- und Abschlag von An- und Verkäufen um %1$d Prozentpunkte.</string>
-    <string name="skill_longdescription_dodge">Erhöht die Abwehrchance bei jeder Stufe um %1$d.</string>
-    <string name="skill_longdescription_barkskin">Erhöht die Schadensresistenz bei jeder Stufe um %1$d.</string>
-    <string name="skill_longdescription_more_criticals">Erhöht bei jeder Stufe die durch die Ausrüstung bestehende kritische Fähigkeit um %1$d %% (prozentualer Anteil an der bestehenden kritischen Fähigkeit, es handelt sich nicht um zusätzliche Prozentpunkte).</string>
-    <string name="skill_longdescription_better_criticals">Erhöht bei jeder Stufe den durch die Ausrüstung bestehenden kritischen Faktor um %1$d %%.</string>
-    <string name="skill_longdescription_speed">Erhöht die maximalen Aktionspunkte (AP) bei jeder Stufe um %1$d.</string>
-    <string name="skill_longdescription_coinfinder">Erhöht bei jeder Stufe die Chance bei einem Gegner Goldmünzen zu finden um %1$d %%. Auch die Menge der gefundenen Goldmünzen erhöht sich jeweils um %2$d %% (bis zu der für den Gegnertyp maximalen Menge).</string>
-    <string name="skill_longdescription_more_exp">Erhöht bei jeder Stufe die Menge der beim besiegen von Gegnern erhaltenen Erfahrung um %1$d %%.</string>
-    <string name="skill_longdescription_cleave">Für besiegte Gegner erhält man bei jeder Stufe +%1$d Aktionspunkte (AP).</string>
-    <string name="skill_longdescription_eater">Für besiegte Gegner erhält man bei jeder Stufe +%1$d Lebenspunkte (LP).</string>
-    <string name="skill_longdescription_fortitude">Für jeden nachfolgenden Level Aufstieg werden die maximalen Lebenspunkte (LP) um %1$d erhöht. Das wird nicht rückwirkend angewandt, nur nachfolgende Level Aufstiege sind betroffen.</string>
-    <string name="skill_longdescription_evasion">Verringert bei jeder Stufe sowohl die Chance eines fehlgeschlagenen Fluchtversuches um %1$d %% als auch die Chance das ein benachbarter Gegner dich angreift um %2$d %%.</string>
-    <string name="skill_longdescription_regeneration">Bei jeder Stufe erhält man pro Runde +%1$d Lebenspunkte (LP) wenn kein Monster auf einem direkt benachbarten Feld ist.</string>
-    <string name="skill_longdescription_lower_exploss">Verringert bei jeder Stufe die Menge der durch den Tod verursachten verlorenen Erfahrung um %1$d %% (prozentualer Anteil an dem bestehenden Erfahrungsverlust, es handelt sich nicht um Prozentpunkte). Durch %2$d Stufen werden alle Erfahrungsverluste, die durch den Tod verursacht werden, entfernt.</string>
-    <string name="skill_longdescription_magicfinder">Erhöht bei jeder Stufe die Chance ungewöhnliche Gegenstände zu finden um %1$d %%.</string>
-    <string name="skill_longdescription_resistance_mental">Verringert bei jeder Stufe die Chance von mentalen Effekten geplagt zu werden um %1$d %%, bis hin zu einem Maximum von %2$d %%. Das beinhaltet von Gegnern hinzugefügte Effekte wie Benommen oder Schwächung der Waffen.</string>
-    <string name="skill_longdescription_resistance_physical_capacity">Verringert bei jeder Stufe die Chance von physischen Effekten geplagt zu werden um %1$d %%, bis hin zu einem Maximum von %2$d %%. Das beinhaltet von Gegnern hinzugefügte Effekte wie Ermüdung.</string>
-    <string name="skill_longdescription_resistance_blood_disorder">Verringert bei jeder Stufe die Chance von Blutstörungen geplagt zu werden um %1$d %%, bis hin zu einem Maximum von %2$d %%. Das beinhaltet von Gegnern hinzugefügte Effekte wie Gift oder Blutende Wunden.</string>
-    
-    <string name="skillinfo_action_levelup">Erlernen</string>
-    <string name="skill_current_level">Aktuelle Stufe: %1$d</string>
-    <string name="skill_current_level_with_maximum">Aktuelle Stufe: %1$d / %2$d</string>
-    <string name="skill_prerequisite_other_skill">Um diesen Skill zu erlernen, wird mindestens die %1$d. Stufe des Skills %2$s benötigt.</string>
-    <string name="skill_prerequisite_level">Um diesen Skill zu erlernen, wird mindestens das Erfahrungslevel %1$d benötigt.</string>
-    <string name="skill_prerequisite_stat">Um diesen Skill zu erlernen, werden mindestens %1$d %2$s benötigt (Basiskampfeigenschaften).</string>
-    <string name="skill_number_of_increases_one">Du kannst einen Skillpunkt ausgeben.</string>
-    <string name="skill_number_of_increases_several">Du kannst %1$d Skillpunkte ausgeben.</string>
-    <string name="levelup_adds_new_skillpoint">In diesem Level erhälst du einen neuen Skillpunkt!</string>
+
+	<string name="skill_title_weapon_chance">Waffen Präzision</string>
+	<string name="skill_title_weapon_dmg">Kräftiger Schlag</string>
+	<string name="skill_title_barter">Kaufmann</string>
+	<string name="skill_title_dodge">Ausweichen</string>
+	<string name="skill_title_barkskin">Rindenhaut</string>
+	<string name="skill_title_more_criticals">Mehr kritischer Schaden</string>
+	<string name="skill_title_better_criticals">Besserer kritischer Schaden</string>
+	<string name="skill_title_speed">Kampfgeschwindigkeit</string>
+	<string name="skill_title_coinfinder">Schatzjäger</string>
+	<string name="skill_title_more_exp">Guter Lehrling</string>
+	<string name="skill_title_cleave">Cleave</string>
+	<string name="skill_title_eater">Leichenesser</string>
+	<string name="skill_title_fortitude">wachsende Standhaftigkeit</string>
+	<string name="skill_title_evasion">Umgehen</string>
+	<string name="skill_title_regeneration">Regeneration</string>
+	<string name="skill_title_lower_exploss">Fehlschläge meistern</string>
+	<string name="skill_title_magicfinder">Magischer Schatzsucher</string>
+	<string name="skill_title_resistance_mental">Starker Verstand</string>
+	<string name="skill_title_resistance_physical_capacity">Ausdauernder Körper</string>
+	<string name="skill_title_resistance_blood_disorder">Reines Blut</string>
+
+	<string name="skill_shortdescription_weapon_chance">Erhöhte Angriffschance</string>
+	<string name="skill_shortdescription_weapon_dmg">Erhöhter Angriffsschaden</string>
+	<string name="skill_shortdescription_barter">Bessere Händlerpreise</string>
+	<string name="skill_shortdescription_dodge">Erhöhte Abwehrchance</string>
+	<string name="skill_shortdescription_barkskin">Schadensresistenz</string>
+	<string name="skill_shortdescription_more_criticals">Erhöhte kritische Fähigkeit</string>
+	<string name="skill_shortdescription_better_criticals">Erhöhter kritischer Schaden</string>
+	<string name="skill_shortdescription_speed">Erhöhte maximale Aktionspunkte</string>
+	<string name="skill_shortdescription_coinfinder">Größere Chance Goldmünzen zu finden</string>
+	<string name="skill_shortdescription_more_exp">Größere Erfahrung von Gegnern</string>
+	<string name="skill_shortdescription_cleave">Regeneriere Aktionspunkte von besiegten Gegnern</string>
+	<string name="skill_shortdescription_eater">Regeneriere Lebenspunkte von besiegten Gegnern</string>
+	<string name="skill_shortdescription_fortitude">Erlange Leben bei jedem Aufstieg</string>
+	<string name="skill_shortdescription_evasion">Erhöhte Chance zu Fliehen</string>
+	<string name="skill_shortdescription_regeneration">Regeneriere jede Runde Lebenspunkte</string>
+	<string name="skill_shortdescription_lower_exploss">Verringere den Verlust an Erfahrungspunkten beim Sterben</string>
+	<string name="skill_shortdescription_magicfinder">Größere Chance magische Gegenstände zu finden</string>
+	<string name="skill_shortdescription_resistance_mental">Widerstand gegen mentale Effekte</string>
+	<string name="skill_shortdescription_resistance_physical_capacity">Widerstand gegen physische Effekte</string>
+	<string name="skill_shortdescription_resistance_blood_disorder">Widerstand gegen Blutstörungen</string>
+
+	<string name="skill_longdescription_weapon_chance">Erhöht die Angriffschance bei jeder Stufe um %1$d.</string>
+	<string name="skill_longdescription_weapon_dmg">Erhöht den minimalen und maximalen Schaden bei jeder Stufe um %1$d.</string>
+	<string name="skill_longdescription_barter">Verringert bei jeder Stufe den Auf- und Abschlag von An- und Verkäufen um %1$d Prozentpunkte.</string>
+	<string name="skill_longdescription_dodge">Erhöht die Abwehrchance bei jeder Stufe um %1$d.</string>
+	<string name="skill_longdescription_barkskin">Erhöht die Schadensresistenz bei jeder Stufe um %1$d.</string>
+	<string name="skill_longdescription_more_criticals">Erhöht bei jeder Stufe die durch die Ausrüstung bestehende kritische Fähigkeit um %1$d %% (prozentualer Anteil an der bestehenden kritischen Fähigkeit, es handelt sich nicht um zusätzliche Prozentpunkte).</string>
+	<string name="skill_longdescription_better_criticals">Erhöht bei jeder Stufe den durch die Ausrüstung bestehenden kritischen Faktor um %1$d %%.</string>
+	<string name="skill_longdescription_speed">Erhöht die maximalen Aktionspunkte (AP) bei jeder Stufe um %1$d.</string>
+	<string name="skill_longdescription_coinfinder">Erhöht bei jeder Stufe die Chance bei einem Gegner Goldmünzen zu finden um %1$d %%. Auch die Menge der gefundenen Goldmünzen erhöht sich jeweils um %2$d %% (bis zu der für den Gegnertyp maximalen Menge).</string>
+	<string name="skill_longdescription_more_exp">Erhöht bei jeder Stufe die Menge der beim besiegen von Gegnern erhaltenen Erfahrung um %1$d %%.</string>
+	<string name="skill_longdescription_cleave">Für besiegte Gegner erhält man bei jeder Stufe +%1$d Aktionspunkte (AP).</string>
+	<string name="skill_longdescription_eater">Für besiegte Gegner erhält man bei jeder Stufe +%1$d Lebenspunkte (LP).</string>
+	<string name="skill_longdescription_fortitude">Für jeden nachfolgenden Level Aufstieg werden die maximalen Lebenspunkte (LP) um %1$d erhöht. Das wird nicht rückwirkend angewandt, nur nachfolgende Level Aufstiege sind betroffen.</string>
+	<string name="skill_longdescription_evasion">Verringert bei jeder Stufe sowohl die Chance eines fehlgeschlagenen Fluchtversuches um %1$d %% als auch die Chance das ein benachbarter Gegner dich angreift um %2$d %%.</string>
+	<string name="skill_longdescription_regeneration">Bei jeder Stufe erhält man pro Runde +%1$d Lebenspunkte (LP) wenn kein Monster auf einem direkt benachbarten Feld ist.</string>
+	<string name="skill_longdescription_lower_exploss">Verringert bei jeder Stufe die Menge der durch den Tod verursachten verlorenen Erfahrung um %1$d %% (prozentualer Anteil an dem bestehenden Erfahrungsverlust, es handelt sich nicht um Prozentpunkte). Durch %2$d Stufen werden alle Erfahrungsverluste, die durch den Tod verursacht werden, entfernt.</string>
+	<string name="skill_longdescription_magicfinder">Erhöht bei jeder Stufe die Chance ungewöhnliche Gegenstände zu finden um %1$d %%.</string>
+	<string name="skill_longdescription_resistance_mental">Verringert bei jeder Stufe die Chance von mentalen Effekten geplagt zu werden um %1$d %%, bis hin zu einem Maximum von %2$d %%. Das beinhaltet von Gegnern hinzugefügte Effekte wie Benommen oder Schwächung der Waffen.</string>
+	<string name="skill_longdescription_resistance_physical_capacity">Verringert bei jeder Stufe die Chance von physischen Effekten geplagt zu werden um %1$d %%, bis hin zu einem Maximum von %2$d %%. Das beinhaltet von Gegnern hinzugefügte Effekte wie Ermüdung.</string>
+	<string name="skill_longdescription_resistance_blood_disorder">Verringert bei jeder Stufe die Chance von Blutstörungen geplagt zu werden um %1$d %%, bis hin zu einem Maximum von %2$d %%. Das beinhaltet von Gegnern hinzugefügte Effekte wie Gift oder Blutende Wunden.</string>
+
+	<string name="skillinfo_action_levelup">Erlernen</string>
+	<string name="skill_current_level">Aktuelle Stufe: %1$d</string>
+	<string name="skill_current_level_with_maximum">Aktuelle Stufe: %1$d / %2$d</string>
+	<string name="skill_prerequisite_other_skill">Um diesen Skill zu erlernen, wird mindestens die %1$d. Stufe des Skills %2$s benötigt.</string>
+	<string name="skill_prerequisite_level">Um diesen Skill zu erlernen, wird mindestens das Erfahrungslevel %1$d benötigt.</string>
+	<string name="skill_prerequisite_stat">Um diesen Skill zu erlernen, werden mindestens %1$d %2$s benötigt (Basiskampfeigenschaften).</string>
+	<string name="skill_number_of_increases_one">Du kannst einen Skillpunkt ausgeben.</string>
+	<string name="skill_number_of_increases_several">Du kannst %1$d Skillpunkte ausgeben.</string>
+	<string name="levelup_adds_new_skillpoint">In diesem Level erhälst du einen neuen Skillpunkt!</string>
 
 	<string name="loadsave_save_to_new_slot">Neuen Speicherplatz anlegen</string>
 	<string name="loadsave_save_overwrite_confirmation_title">Speicherplatz überschreiben?</string>
-	<string name="loadsave_save_overwrite_confirmation">Dieser Speicherplatz enthält einen anderen Spielernamen (%1$s) als den aktuellen Spielernamen (%2$s). Soll dieser Spielstand wirklich überschrieben werden?</string> 
-	
+	<string name="loadsave_save_overwrite_confirmation">Dieser Speicherplatz enthält einen anderen Spielernamen (%1$s) als den aktuellen Spielernamen (%2$s). Soll dieser Spielstand wirklich überschrieben werden?</string>
+
 	<string name="iteminfo_displaytypes_ordinary">Gewöhnlich</string>
 	<string name="iteminfo_displaytypes_quest">Quest Gegenstand</string>
 	<string name="iteminfo_displaytypes_legendary">Legendär</string>
 	<string name="iteminfo_displaytypes_extraordinary">Außergewöhnlich</string>
 	<string name="iteminfo_displaytypes_rare">Selten</string>
-	
+
 	<string name="actorconditioninfo_category">Effekt Kategorie: %1$s</string>
 	<string name="actorcondition_categories_spiritual">Geistig</string>
 	<string name="actorcondition_categories_mental">Mental</string>
 	<string name="actorcondition_categories_physical">Physisch</string>
 	<string name="actorcondition_categories_blood">Blutstörungen</string>
-	
+
 	<string name="traitsinfo_base_max_hp">Max LP:</string>
 	<string name="traitsinfo_base_max_ap">Max AP:</string>
 	<string name="menu_save_saving_not_allowed_in_combat">Das Spiel kann während des Kampfes nicht gespeichert werden.</string>
-	
+
 	<string name="preferences_optimized_drawing_title">Optimierter Bildschirmaufbau</string>
 	<string name="preferences_optimized_drawing">Deaktiviere diese Option wenn du Grafikfehler siehst. Wenn diese Einstellung aktiv ist, werden bei jedem Frame nur die geänderten Teile des Bildschirms neu gezeichnet.</string>
 
 	<!-- =========================================== -->
 	<!-- Added in v0.6.11 -->
-	
+
 	<string name="skill_title_shadow_bless">Dunkler Segen des Schattens</string>
-    <string name="skill_shortdescription_shadow_bless">Widerstand gegen Effekte aller Art</string>
-    <string name="skill_longdescription_shadow_bless">Verringert die Chance von Effekten aller Art geplagt zu werden um %1$d %%. Das beeinhaltet alle von Gegnern hinzugefügten Effekte wie beispielsweise Vergiftung, Benommen und Ermüdung.</string>
-    
-    <string name="inventory_movetop">Nach ganz oben verschieben</string>
-    <string name="inventory_movebottom">Nach ganz unten verschieben</string>
-    <string name="actorinfo_immune_criticals">Kritischen Treffern gegenüber immun</string>
-    <string name="traitsinfo_criticalhit_effectivechance">Effektive kritische Treffer:</string>
+	<string name="skill_shortdescription_shadow_bless">Widerstand gegen Effekte aller Art</string>
+	<string name="skill_longdescription_shadow_bless">Verringert die Chance von Effekten aller Art geplagt zu werden um %1$d %%. Das beeinhaltet alle von Gegnern hinzugefügten Effekte wie beispielsweise Vergiftung, Benommen und Ermüdung.</string>
 
-   	<string name="skill_title_crit1">Innere Blutung</string>
-    <string name="skill_shortdescription_crit1">Chance innere Blutungen zuzufügen</string>
-    <string name="skill_longdescription_crit1">Bei jedem kritischen Treffer gibt es eine %1$d %% Chance dem Gegner innere Blutungen zuzufügen. Durch den Effekt \'Innere Blutung\' werden die offensiven Kampfeigenschaften stark eingeschränkt und der Gegner wird weniger erfolgreiche Angriffe durchführen können.</string>
-   	<string name="skill_title_crit2">Knochenbrecher</string>
-    <string name="skill_shortdescription_crit2">Chance Knochen zu brechen</string>
-    <string name="skill_longdescription_crit2">Bei jedem kritischen Treffer gibt es eine %1$d %% Chance einige Knochen des Gegners zu brechen. Durch den Effekt \'Knochenbruch\' werden die defensiven Kampfeigenschaften stark eingeschränkt und der Gegner wird sich weniger gegen nachfolgende Angriffe verteidigen können.</string>
-    <string name="skill_title_rejuvenation">Verjüngung</string>
-    <string name="skill_shortdescription_rejuvenation">Chance Effekte zu entfernen</string>
-    <string name="skill_longdescription_rejuvenation">Jede Runde (alle 6 Sekunden) gibt es eine %1$d %% Chance dass einer der aktiven negativen Effekte um eine Größenordnung verringert wird. Das gilt für alle temporären Effektarten die den Körper betreffen; mentale Effekte wie Benommen, physische Effekte wie Ermüdung und auch Blutstörungen wie Gift.</string>
-   	<string name="skill_title_taunt">Verspotten</string>
-    <string name="skill_shortdescription_taunt">Angreifer verliert bei Fehlschlägen Aktionspunkte</string>
-    <string name="skill_longdescription_taunt">Wenn ein Angriff eines Gegners fehlschlägt gibt es eine %1$d %% Chance dass er dabei %2$d Aktionspunkte (AP) verliert. Das gilt für alle Nahkampfangriffe gegen dich.</string>
-   	<string name="skill_title_concussion">Gehirnerschütterung</string>
-    <string name="skill_shortdescription_concussion">größere Chance eine Gehirnerschütterung zuzufügen</string>
-    <string name="skill_longdescription_concussion">Bei einem Angriff auf einen Gegner dessen Abwehrchance (BC) mindestens um %1$d tiefer als deine Angriffschance (AC) ist, gibt es eine %2$d %% Chance dass ein Treffer dem Gegner eine Gehirnerschütterung zufügt. Durch den Effekt \'Gehirnerschütterung\' werden die offensiven Kampfeigenschaften stark eingeschränkt und der Gegner wird weniger erfolgreiche Angriffe durchführen können.</string>
+	<string name="inventory_movetop">Nach ganz oben verschieben</string>
+	<string name="inventory_movebottom">Nach ganz unten verschieben</string>
+	<string name="actorinfo_immune_criticals">Kritischen Treffern gegenüber immun</string>
+	<string name="traitsinfo_criticalhit_effectivechance">Effektive kritische Treffer:</string>
+
+	<string name="skill_title_crit1">Innere Blutung</string>
+	<string name="skill_shortdescription_crit1">Chance innere Blutungen zuzufügen</string>
+	<string name="skill_longdescription_crit1">Bei jedem kritischen Treffer gibt es eine %1$d %% Chance dem Gegner innere Blutungen zuzufügen. Durch den Effekt \'Innere Blutung\' werden die offensiven Kampfeigenschaften stark eingeschränkt und der Gegner wird weniger erfolgreiche Angriffe durchführen können.</string>
+	<string name="skill_title_crit2">Knochenbrecher</string>
+	<string name="skill_shortdescription_crit2">Chance Knochen zu brechen</string>
+	<string name="skill_longdescription_crit2">Bei jedem kritischen Treffer gibt es eine %1$d %% Chance einige Knochen des Gegners zu brechen. Durch den Effekt \'Knochenbruch\' werden die defensiven Kampfeigenschaften stark eingeschränkt und der Gegner wird sich weniger gegen nachfolgende Angriffe verteidigen können.</string>
+	<string name="skill_title_rejuvenation">Verjüngung</string>
+	<string name="skill_shortdescription_rejuvenation">Chance Effekte zu entfernen</string>
+	<string name="skill_longdescription_rejuvenation">Jede Runde (alle 6 Sekunden) gibt es eine %1$d %% Chance dass einer der aktiven negativen Effekte um eine Größenordnung verringert wird. Das gilt für alle temporären Effektarten die den Körper betreffen; mentale Effekte wie Benommen, physische Effekte wie Ermüdung und auch Blutstörungen wie Gift.</string>
+	<string name="skill_title_taunt">Verspotten</string>
+	<string name="skill_shortdescription_taunt">Angreifer verliert bei Fehlschlägen Aktionspunkte</string>
+	<string name="skill_longdescription_taunt">Wenn ein Angriff eines Gegners fehlschlägt gibt es eine %1$d %% Chance dass er dabei %2$d Aktionspunkte (AP) verliert. Das gilt für alle Nahkampfangriffe gegen dich.</string>
+	<string name="skill_title_concussion">Gehirnerschütterung</string>
+	<string name="skill_shortdescription_concussion">größere Chance eine Gehirnerschütterung zuzufügen</string>
+	<string name="skill_longdescription_concussion">Bei einem Angriff auf einen Gegner dessen Abwehrchance (BC) mindestens um %1$d tiefer als deine Angriffschance (AC) ist, gibt es eine %2$d %% Chance dass ein Treffer dem Gegner eine Gehirnerschütterung zufügt. Durch den Effekt \'Gehirnerschütterung\' werden die offensiven Kampfeigenschaften stark eingeschränkt und der Gegner wird weniger erfolgreiche Angriffe durchführen können.</string>
+
+	<string name="about_button4">Über</string>
 
-    <string name="about_button4">Über</string>
-	
 	<!-- =========================================== -->
 	<!-- Added in v0.6.12 -->
-	
-    <string name="preferences_ui_category">Oberfläche</string>
-    <string name="preferences_ui_enable_animations_title">Aktiviere Animationen</string>
-    <string name="preferences_ui_enable_animations">Animiere verschiedene Elemente der Oberfläche, wie den Balken mit den Befehlen im Kampf.</string>
-    <string name="menu_button_worldmap">Karte</string>
-    <string name="menu_button_worldmap_failed">Die Karte kann nicht angezeigt werden.</string>
-    <string name="display_worldmap_not_available">Die Karte kann an diesem Ort nicht aufgerufen werden.</string>
-    <string name="display_worldmap_title">Karte</string>
-    
+
+	<string name="preferences_ui_category">Oberfläche</string>
+	<string name="preferences_ui_enable_animations_title">Aktiviere Animationen</string>
+	<string name="preferences_ui_enable_animations">Animiere verschiedene Elemente der Oberfläche, wie den Balken mit den Befehlen im Kampf.</string>
+	<string name="menu_button_worldmap">Karte</string>
+	<string name="menu_button_worldmap_failed">Die Karte kann nicht angezeigt werden.</string>
+	<string name="display_worldmap_not_available">Die Karte kann an diesem Ort nicht aufgerufen werden.</string>
+	<string name="display_worldmap_title">Karte</string>
+
 	<string name="inventory_equip_offhand">Anlegen (Nebenhand)</string>
-	
+
 	<string name="iteminfo_effect_weapon_attack_cost">Angriffskosten: %1$d AP</string>
 	<string name="iteminfo_effect_increase_attack_cost">Erhöht die Angriffskosten um %1$d AP</string>
 	<string name="iteminfo_effect_decrease_attack_cost">Verringert die Angriffskosten um %1$d AP</string>
@@ -494,19 +494,19 @@
 	<string name="iteminfo_effect_decrease_use_cost">Reduziert die AP Kosten Gegenstände im Kampf zu verwenden um %1$d AP</string>
 	<string name="iteminfo_effect_increase_reequip_cost">Erhöht die AP Kosten Gegenstände im Kampf anzulegen um %1$d AP</string>
 	<string name="iteminfo_effect_decrease_reequip_cost">Reduziert die AP Kosten Gegenstände im Kampf anzulegen um %1$d AP</string>
-	
-	<string name="loadsave_save_overwrite_confirmation_all">Soll dieser Spielstand wirklich überschrieben werden?</string> 
+
+	<string name="loadsave_save_overwrite_confirmation_all">Soll dieser Spielstand wirklich überschrieben werden?</string>
 	<string name="loadsave_save_overwrite_confirmation_slot">(Speicherplatz %1$d)</string>
 	<string name="preferences_display_overwrite_savegame_entries_always_confirm">Immer eine Bestätigung anzeigen</string>
 	<string name="preferences_display_overwrite_savegame_entries_confirm_overwrite">Nur dann eine Bestätigung anzeigen, wenn ein anderer Spielername überschrieben wird</string>
 	<string name="preferences_display_overwrite_savegame_entries_never_confirm">Nie eine Bestätigung anzeigen</string>
 	<string name="preferences_dialog_overwrite_savegame_title">Bestätige das Überschreiben von Spielständen</string>
 	<string name="preferences_dialog_overwrite_savegame">Zeigt eine Frage an ob beim Speichern auf einen bereits existierenden Spielstand dieser überschrieben werden soll.</string>
-	
+
 
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
-	
+
 	<string name="localize_resources_from_mo_filename">de.mo</string>
-			
+
 </resources>
diff --git a/AndorsTrail/res/values-de/strings_about.xml b/AndorsTrail/res/values-de/strings_about.xml
index b1bb3a5b3..df78130c1 100644
--- a/AndorsTrail/res/values-de/strings_about.xml
+++ b/AndorsTrail/res/values-de/strings_about.xml
@@ -27,7 +27,7 @@
 <div><b>Angreifen</b> - [3AP] *</div>
 <img alt="attacking" src="doubleattackexample.png" />
 <p>* (das Anlegen von Ausrüstung &amp; das Verwenden von Gegenständen kann die AP &amp; Kosten verändern)</p>
-	
+
 <div><b>Gegenstände verwenden</b> - [5AP]</div>
 <div><b>Fliehen</b> - [6AP]</div>
 
diff --git a/AndorsTrail/res/values-fr/strings.xml b/AndorsTrail/res/values-fr/strings.xml
index 740a5e11c..3365f5470 100644
--- a/AndorsTrail/res/values-fr/strings.xml
+++ b/AndorsTrail/res/values-fr/strings.xml
@@ -1,443 +1,443 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <resources>
-  <string name="app_name">La Piste d\'Andor</string>
-  <string name="app_description">Jeu de rôle fantastique à base de quêtes</string>
+	<string name="app_name">La Piste d\'Andor</string>
+	<string name="app_description">Jeu de rôle fantastique à base de quêtes</string>
 
-  <string name="exit">Quitter</string>
-  <string name="exit_to_menu">Retour au menu</string>
-  <string name="menu_pause">Pause</string>
-  <string name="menu_settings">Préférences</string>
-  <string name="menu_save">Sauver</string>
-  <string name="menu_load">Charger</string>
-  <string name="menu_save_gamesaved">La partie a été sauvegardé dans l\'emplacement %1$d</string>
-  <string name="menu_save_failed">Échec de la sauvegarde de la partie ! La carte SD est-elle montée et inscriptible ?</string>
+	<string name="exit">Quitter</string>
+	<string name="exit_to_menu">Retour au menu</string>
+	<string name="menu_pause">Pause</string>
+	<string name="menu_settings">Préférences</string>
+	<string name="menu_save">Sauver</string>
+	<string name="menu_load">Charger</string>
+	<string name="menu_save_gamesaved">La partie a été sauvegardé dans l\'emplacement %1$d</string>
+	<string name="menu_save_failed">Échec de la sauvegarde de la partie ! La carte SD est-elle montée et inscriptible ?</string>
 
-  <string name="loadsave_title_save">Partie sauvegardée</string>
-  <string name="loadsave_title_load">Charger une partie sauvegardée</string>
-  <string name="loadsave_selectslot">Sélectionner un emplacement</string>
-  <string name="loadsave_slot_empty">(vide)</string>
-  <string name="savegame_currenthero_displayinfo">niveau %1$d, %2$d exp, %3$d or</string>
-  
-  <string name="dialog_loading_message">Chargement des ressources...</string>
-  <string name="dialog_loading_failed_title">Échec du chargement</string>
-  <string name="dialog_loading_failed_message">Impossible de charger la sauvegarde.\n\n:(\n\nLe fichier est peut-être endommagé ou incomplet.</string>
-  <string name="dialog_loading_failed_incorrectversion">Impossible de charger la sauvegarde. Cette sauvegarde a été créée avec une version plus récente du jeu.</string>
-  
-  <string name="dialog_close">Fermer</string>
-  
-  <string name="dialog_confirmexit_title">Quitter</string>
-  <string name="dialog_confirmexit_message">Voulez-vous vraiment quitter ?</string>
-  
-  <string name="dialog_paused_title">En pause</string>
-  <string name="dialog_paused_message">Jeu en pause</string>
-  <string name="dialog_paused_resume">Reprendre</string>
+	<string name="loadsave_title_save">Partie sauvegardée</string>
+	<string name="loadsave_title_load">Charger une partie sauvegardée</string>
+	<string name="loadsave_selectslot">Sélectionner un emplacement</string>
+	<string name="loadsave_slot_empty">(vide)</string>
+	<string name="savegame_currenthero_displayinfo">niveau %1$d, %2$d exp, %3$d or</string>
 
-  <string name="dialog_monsterencounter_title">Rencontre</string>
-  <string name="dialog_monsterencounter_message">Voulez-vous attaquer ?\nDifficulté : %1$s</string>
-  <string name="dialog_monsterencounter_info">Info</string>
+	<string name="dialog_loading_message">Chargement des ressources...</string>
+	<string name="dialog_loading_failed_title">Échec du chargement</string>
+	<string name="dialog_loading_failed_message">Impossible de charger la sauvegarde.\n\n:(\n\nLe fichier est peut-être endommagé ou incomplet.</string>
+	<string name="dialog_loading_failed_incorrectversion">Impossible de charger la sauvegarde. Cette sauvegarde a été créée avec une version plus récente du jeu.</string>
 
-  <string name="status_hp">HP :</string>
-  <string name="status_mp">MP :</string>
-  <string name="status_ap">AP :</string>
-  <string name="status_exp">Niv. :</string>
+	<string name="dialog_close">Fermer</string>
 
-  <string name="heroinfo_char">Vue d\'ensemble</string>
-  <string name="heroinfo_inv">Inventaire</string>
-  <string name="heroinfo_wear">Équipé</string>
-  <string name="heroinfo_skill">Compétences</string>
-  <string name="heroinfo_spell">Sorts</string>
-  <string name="heroinfo_levelup">Niveau supérieur</string>
-  <string name="heroinfo_level">Niveau</string>
-  <string name="heroinfo_totalexperience">Expérience totale</string>  
-  <string name="heroinfo_wornequipment">Équipement porté</string>
-  <string name="heroinfo_inventory">Inventaire</string>
-  <string name="heroinfo_gold">Or : %1$d</string>
-  <string name="heroinfo_actionpoints">Points d\'action (AP) :</string>
-  <string name="heroinfo_quests">Quêtes</string>
-  
-  <string name="combat_attack">Attaque (%1$d AP)</string>
-  <string name="combat_move">Déplacement (%1$d AP)</string>
-  <string name="combat_use">Utiliser objet</string>
-  <string name="combat_spell">Sort</string>
-  <string name="combat_endturn">Fin du tour</string>
-  <!-- <string name="combat_endcombat">End combat</string>-->
-  <string name="combat_flee">Fuir</string>
-  <string name="combat_begin_flee">Vous pouvez maintenant fuir le combat en cliquant dans la direction vers laquelle vous souhaitez vous déplacer.</string>
-  <string name="combat_flee_failed">Vous n\'avez pas réussi à fuir !</string>
-  <string name="combat_status_ap">AP : %1$d</string>
-  <string name="combat_monsterhealth">HP :</string>
-  <string name="combat_monsteraction">%1$s attaque.</string>
-  <!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat.</string>  -->
-  <string name="combat_result_monstermiss">%1$s rate son attaque !</string>
-  <string name="combat_result_monsterhit">%1$s vous frappe pour %2$d hp !</string>
-  <string name="combat_result_monsterhitcritical">%1$s vous frappe avec un coup critique pour %2$d hp !</string>
-  <string name="combat_result_heromiss">Vous ratez votre attaque.</string>
-  <string name="combat_result_herohit">Vous frappez %1$s pour %2$d hp !</string>
-  <string name="combat_result_herohitcritical">Vous frappez %1$s avec un coup critique pour %2$d hp !</string>
-  <string name="combat_result_herokillsmonster">Vous avez tué %1$s !</string>
-  <string name="combat_not_enough_ap">Vous n\'avez plus d\'AP disponibles ce tour-ci.</string>
-  <string name="combat_hero_dies">Le monde tourne et s\'éteint autour de vous tandis que vous perdez connaissance... Heureusement, vous vous réveillez en vie. Vous perdez %1$d points d\'expérience.</string>
-    
-  <string name="inventory_info">Info</string>
-  <string name="inventory_equip">Équiper</string>
-  <string name="inventory_unequip">Déséquiper</string>
-  <string name="inventory_use">Utiliser</string>
-  <string name="inventory_drop">Lâcher</string>
-  <string name="inventory_item_used">Vous avez utilisé %1$s.</string>
-  <string name="inventory_item_dropped">Vous avez lâché %1$s.</string>
-  <string name="inventory_item_equipped">Vous vous êtes équipé de %1$s.</string>
+	<string name="dialog_confirmexit_title">Quitter</string>
+	<string name="dialog_confirmexit_message">Voulez-vous vraiment quitter ?</string>
 
-  <string name="dialog_loot_pickall">Ramasser tout</string>
-  <string name="dialog_loot_foundgold">Vous avez trouvé %1$d or. </string>
-  <string name="dialog_loot_pickedupitem">Vous avez ramassé un objet. </string>
-  <string name="dialog_loot_pickedupitems">Vous avez ramassé %1$d objets. </string>
-  <string name="dialog_groundloot_title">Objets</string>
-  <string name="dialog_groundloot_message">Vous avez trouvé quelques objets. </string>
-  <string name="dialog_monsterloot_title">Victoire</string>
-  <string name="dialog_monsterloot_message">Vous avez survécu à la rencontre. </string>
-  <string name="dialog_monsterloot_gainedexp">Vous avez acquis %1$d points d\'expérience. </string>
-    
-    <string name="monster_difficulty_veryeasy">Très facile</string>
-    <string name="monster_difficulty_easy">Facile</string>
-    <string name="monster_difficulty_normal">Normal</string>
-    <string name="monster_difficulty_hard">Difficile</string>
-    <string name="monster_difficulty_veryhard">Très difficile</string>
-    <string name="monster_difficulty_impossible">Impossible</string>
+	<string name="dialog_paused_title">En pause</string>
+	<string name="dialog_paused_message">Jeu en pause</string>
+	<string name="dialog_paused_resume">Reprendre</string>
 
-    <string name="actorinfo_class">Classe :</string>
-    <string name="actorinfo_difficulty">Difficulté :</string>
-    <string name="actorinfo_health">Santé :</string>
-    <string name="actorinfo_attacksperturn">Attaques/tour :</string>
-    <string name="actorinfo_movesperturn">Mouvement/tour :</string>
-    <string name="actorinfo_attack">Attaque :</string>
-    <string name="actorinfo_criticalhit">Coup critique :</string>
-    <string name="actorinfo_defense">Défense :</string>
-    <string name="actorinfo_movecost">Coût de déplacement (AP) :</string>
-    <string name="actorinfo_basetraits">Statistiques de combat de base (sans équipement ni compétences)</string>
-    <string name="actorinfo_currenttraits">Statistiques de combat actuelles</string>
-    
-    <string name="traitsinfo_attack_cost">Coût d\'une attaque (AP) :</string>
-    <string name="traitsinfo_attack_chance">Probabilité de toucher :</string>
-    <string name="traitsinfo_attack_damage">Dégâts :</string>
-    <string name="traitsinfo_criticalhit_skill">Probabilité de coup critique :</string>
-    <string name="traitsinfo_criticalhit_multiplier">Coefficient de coup critique :</string>
-    <string name="traitsinfo_defense_chance">Probabilité de bloquer :</string>
-    <string name="traitsinfo_defense_damageresist">Résistance aux dégâts :</string>
-    
-  <!-- <string name="key_required">Une clé spécifique est requise pour passer.</string>  -->
+	<string name="dialog_monsterencounter_title">Rencontre</string>
+	<string name="dialog_monsterencounter_message">Voulez-vous attaquer ?\nDifficulté : %1$s</string>
+	<string name="dialog_monsterencounter_info">Info</string>
 
-  <string name="iteminfo_category">Catégorie : </string>
-  <string name="iteminfo_action_use">Utiliser</string>
-  <string name="iteminfo_action_equip">Équiper</string>
-  <string name="iteminfo_action_unequip">Déséquiper</string>
-  <string name="iteminfo_action_use_ap">Utiliser (%1$d AP)</string>
-  <string name="iteminfo_action_equip_ap">Équiper (%1$d AP)</string>
-  <string name="iteminfo_action_unequip_ap">Déséquiper (%1$d AP)</string>
+	<string name="status_hp">HP :</string>
+	<string name="status_mp">MP :</string>
+	<string name="status_ap">AP :</string>
+	<string name="status_exp">Niv. :</string>
 
-  <string name="itemcategory_money">Argent</string>
-  <string name="itemcategory_weapon">Arme</string>
-  <string name="itemcategory_shield">Bouclier</string>
-  <string name="itemcategory_wearable_head">Vêtement (tête)</string>
-  <string name="itemcategory_wearable_body">Vêtement (corps)</string>
-  <string name="itemcategory_wearable_hand">Vêtement (mains)</string>
-  <string name="itemcategory_wearable_feet">Chaussure (pieds)</string>
-  <string name="itemcategory_wearable_neck">Bijou (cou)</string>
-  <string name="itemcategory_wearable_ring">Bijou (anneau)</string>
-  <string name="itemcategory_potion">Potion</string>
-  <string name="itemcategory_other">Autre</string>
-  
-  <string name="startscreen_continue">Continuer la partie en cours</string>
-  <string name="startscreen_newgame">Nouvelle partie</string>
-  <string name="startscreen_newgame_confirm">Vous perdrez votre partie en cours et votre personnage, êtes-vous sûr de vouloir démarrer une nouvelle partie ?</string>
-  <string name="startscreen_about">À propos/aide</string>
-  <string name="startscreen_enterheroname">Entrer le nom du personnage</string>
-  <string name="startscreen_load">Charger</string>
-  
-  <!-- <string name="conversation_title">%1$s Dit</string>  -->
-  <string name="conversation_rewardexp"> [Vous avez acquis %1$d points d\'expérience]</string>
-  <string name="conversation_rewardgold"> [Vous avez gagné %1$d pièces d\'or]</string>
-  <string name="conversation_lostgold"> [Vous avez perdu %1$d pièces d\'or]</string>
-  <string name="conversation_rewarditem"> [Vous avez gagné un objet]</string>
-  <string name="conversation_rewarditems"> [Vous avez gagné %1$d objets]</string>
-  <string name="conversation_next">Suivant</string>
-  <string name="conversation_leave">Partir</string>
-  
-  <string name="shop_buy">Acheter</string>
-  <string name="shop_sell">Vendre</string>
-  <string name="shop_infoitem">Info</string>
-  <string name="shop_buyitem">Acheter (%1$d or)</string>
-  <string name="shop_sellitem">Vendre (%1$d or)</string>
-  <string name="shop_yourgold">Votre or : %1$d</string>
-  <string name="shop_item_bought">%1$s acheté.</string>
-  <string name="shop_item_sold">%1$s vendu.</string>
-  
-  <string name="levelup_title">Niveau supérieur</string>
-  <string name="levelup_description">Bienvenue au niveau %1$d !</string>
-  <string name="levelup_buttontext">Niveau supérieur</string>
-  <string name="levelup_add_health">Augmenter les points de vie (+%1$d HP)</string>
-  <string name="levelup_add_health_description">Ajoute %1$d à votre total de points de vie.</string>
-  <string name="levelup_add_attackchance">Augmenter la probabilité de toucher (+%1$d %%)</string>
-  <string name="levelup_add_attackchance_description">Ajoute %1$d%% à votre probabilité de toucher de base.</string>
-  <string name="levelup_add_attackdamage">Augmenter les dégâts (+%1$d)</string>
-  <string name="levelup_add_attackdamage_description">Ajoute %1$d à vos dégâts de base.</string>
-  <string name="levelup_add_blockchance">Augmenter la probabilité de bloquer (+%1$d %%)</string>
-  <string name="levelup_add_blockchance_description">Ajoute %1$d%% à votre probabilité de bloquer de base.</string>
-  
-  <string name="dialog_rest_title">Repos</string>
-  <string name="dialog_rest_confirm_message">Voulez-vous vous reposer ici ?</string>
-  <string name="dialog_rest_message">Vous vous êtes bien reposé et êtes prêt à repartir à l\'aventure.</string>
+	<string name="heroinfo_char">Vue d\'ensemble</string>
+	<string name="heroinfo_inv">Inventaire</string>
+	<string name="heroinfo_wear">Équipé</string>
+	<string name="heroinfo_skill">Compétences</string>
+	<string name="heroinfo_spell">Sorts</string>
+	<string name="heroinfo_levelup">Niveau supérieur</string>
+	<string name="heroinfo_level">Niveau</string>
+	<string name="heroinfo_totalexperience">Expérience totale</string>
+	<string name="heroinfo_wornequipment">Équipement porté</string>
+	<string name="heroinfo_inventory">Inventaire</string>
+	<string name="heroinfo_gold">Or : %1$d</string>
+	<string name="heroinfo_actionpoints">Points d\'action (AP) :</string>
+	<string name="heroinfo_quests">Quêtes</string>
 
-  <string name="about_button1">Aide</string>
-  <string name="about_button2">Auteurs</string>
-  <string name="about_button3">Licence</string>
-  <string name="about_contents1">
-    Merci d\'utiliser La Piste d\'Andor, un jeu de rôle libre pour Android.&lt;br /&gt;
-    &lt;br /&gt;
-    &lt;a href="http://andorstrail.com/"&gt;Forum du jeu andorstrail.com pour les questions et les discussions sur la façon de jouer.&lt;/a&gt;&lt;br /&gt;
-    &lt;br /&gt;
-	&lt;a href="http://andorstrail.com/wiki"&gt;Game wiki for info about the Andor\'s Trail world, among other things.&lt;/a&gt;&lt;br /&gt;
-	&lt;br /&gt;
-    &lt;a href="http://code.google.com/p/andors-trail/"&gt;Page du projet sur code.google.com pour les développeurs.&lt;/a&gt;&lt;br /&gt;
-    &lt;br /&gt;
-    Vous pouvez visiter les forums pour discuter du jeu avec d\'autres joueurs.&lt;br /&gt;
-  </string>
-  <string name="about_contents3">
-    Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le modifier suivant les termes de la « GNU General Public License » telle que publiée par la Free Software Foundation ; soit la version 2 de cette licence, soit (à votre discrétion) une version ultérieure quelconque.&lt;br /&gt;
-    &lt;br /&gt;
-    Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE : sans même la garantie implicite de COMMERCIABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.
-    &lt;br /&gt;
-    Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez : &lt;a href="http://www.gnu.org/licenses"&gt;http://www.gnu.org/licenses&lt;/a&gt;&lt;br /&gt;
-    &lt;br /&gt;
-    Pour toute requête concernant le code source ou les fonctionnalités, veuillez visiter la page du projet : &lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
-  </string>
-  
-  <string name="dialog_newversion_title">Bienvenue</string>
-  <string name="dialog_newversion_message">
-    Merci à vous d\'avoir téléchargé La Piste d\'Andor !\n\n
-    Veuillez noter que cette version de La Piste d\'Andor est un TRAVAIL EN COURS, cela signifie que toutes les cartes ne sont pas encore complètes.\n
-    Vous pouvez visiter les forums du projet pour obtenir plus d\'informations ou pour contribuer au projet (voir « À propos »).\n
-    \n
-    Merci pour les retours d\'utilisation !
-  </string> 
-  
-  <string name="questlog_title">Quêtes</string>
-  <string name="questlog_includecompleted_prompt">Sélectionner les quêtes à afficher</string>
-  <string name="questlog_includecompleted_hidecompleted">Cacher les quêtes terminées</string>
-  <string name="questlog_includecompleted_includecompleted">Inclure les quêtes terminées</string>
-  <string name="questlog_includecompleted_onlycompleted">N\'afficher que les quêtes terminées</string>
-  <string name="questlog_queststatus">État : %1$s</string>
-  <string name="questlog_queststatus_inprogress">En cours</string>
-  <string name="questlog_queststatus_completed">Terminée</string>
-  
-  <string name="preferences_display_category">Affichage</string>
-  <string name="preferences_display_fullscreen_title">Plein écran</string>
-  <string name="preferences_display_fullscreen">Affiche le jeu en mode plein écran (nécessite un redémarrage)</string>
-  <string name="preferences_dialog_category">Dialogue de confirmation</string>
-  <string name="preferences_dialog_confirmrest_title">Confirmer le repos</string>
-  <string name="preferences_dialog_confirmrest">Demande si vous voulez vous reposer quand vous êtes sur un lit. Sinon, vous serez toujours automatiquement mis au repos.</string>
-  <string name="preferences_dialog_confirmattack_title">Confirmer les attaques</string>
-  <string name="preferences_dialog_confirmattack">Active la boîte de dialogue « Voulez-vous attaquer ? » quand vous attaquez un monstre.</string>
-  <string name="preferences_dialog_monsterloot_title">Afficher le butin des monstres</string>
-  <string name="preferences_dialog_monsterloot">Change la façon dont s\'affichent les résultats d\'un combat (or, expérience, objets)</string>
-  <string name="preferences_combat_category">Combat</string>
-  <string name="preferences_combat_speed_title">Vitesse des combats</string>
-  <string name="preferences_combat_speed">Détermine la vitesse d\'attaque des monstres.</string>
+	<string name="combat_attack">Attaque (%1$d AP)</string>
+	<string name="combat_move">Déplacement (%1$d AP)</string>
+	<string name="combat_use">Utiliser objet</string>
+	<string name="combat_spell">Sort</string>
+	<string name="combat_endturn">Fin du tour</string>
+	<!-- <string name="combat_endcombat">End combat</string>-->
+	<string name="combat_flee">Fuir</string>
+	<string name="combat_begin_flee">Vous pouvez maintenant fuir le combat en cliquant dans la direction vers laquelle vous souhaitez vous déplacer.</string>
+	<string name="combat_flee_failed">Vous n\'avez pas réussi à fuir !</string>
+	<string name="combat_status_ap">AP : %1$d</string>
+	<string name="combat_monsterhealth">HP :</string>
+	<string name="combat_monsteraction">%1$s attaque.</string>
+	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat.</string> -->
+	<string name="combat_result_monstermiss">%1$s rate son attaque !</string>
+	<string name="combat_result_monsterhit">%1$s vous frappe pour %2$d hp !</string>
+	<string name="combat_result_monsterhitcritical">%1$s vous frappe avec un coup critique pour %2$d hp !</string>
+	<string name="combat_result_heromiss">Vous ratez votre attaque.</string>
+	<string name="combat_result_herohit">Vous frappez %1$s pour %2$d hp !</string>
+	<string name="combat_result_herohitcritical">Vous frappez %1$s avec un coup critique pour %2$d hp !</string>
+	<string name="combat_result_herokillsmonster">Vous avez tué %1$s !</string>
+	<string name="combat_not_enough_ap">Vous n\'avez plus d\'AP disponibles ce tour-ci.</string>
+	<string name="combat_hero_dies">Le monde tourne et s\'éteint autour de vous tandis que vous perdez connaissance... Heureusement, vous vous réveillez en vie. Vous perdez %1$d points d\'expérience.</string>
 
-  <string name="preferences_display_loot_dialog">Afficher la boîte de dialogue des butins</string>
-  <string name="preferences_display_loot_toast">Afficher une simple notification</string>
-  <string name="preferences_display_loot_never">Ne rien afficher</string>
-  <string name="preferences_attackspeed_instant">Instantanée (pas d\'animations)</string>
-  <string name="preferences_attackspeed_fast">Rapide</string>
-  <string name="preferences_attackspeed_normal">Normale</string>
-  <string name="preferences_attackspeed_slow">Lente</string>
-  
-  <string name="preferences_movement_category">Déplacement</string>
-  <string name="preferences_movementmethod_title">Méthode de déplacement</string>
-  <string name="preferences_movementmethod">Méthode de déplacement et de gestion des obstacles.</string>
-  <string name="preferences_movementmethods_straight">Tout droit</string>
-  <string name="preferences_movementmethods_avoid">Éviter les obstacles</string>
+	<string name="inventory_info">Info</string>
+	<string name="inventory_equip">Équiper</string>
+	<string name="inventory_unequip">Déséquiper</string>
+	<string name="inventory_use">Utiliser</string>
+	<string name="inventory_drop">Lâcher</string>
+	<string name="inventory_item_used">Vous avez utilisé %1$s.</string>
+	<string name="inventory_item_dropped">Vous avez lâché %1$s.</string>
+	<string name="inventory_item_equipped">Vous vous êtes équipé de %1$s.</string>
+
+	<string name="dialog_loot_pickall">Ramasser tout</string>
+	<string name="dialog_loot_foundgold">Vous avez trouvé %1$d or. </string>
+	<string name="dialog_loot_pickedupitem">Vous avez ramassé un objet. </string>
+	<string name="dialog_loot_pickedupitems">Vous avez ramassé %1$d objets. </string>
+	<string name="dialog_groundloot_title">Objets</string>
+	<string name="dialog_groundloot_message">Vous avez trouvé quelques objets. </string>
+	<string name="dialog_monsterloot_title">Victoire</string>
+	<string name="dialog_monsterloot_message">Vous avez survécu à la rencontre. </string>
+	<string name="dialog_monsterloot_gainedexp">Vous avez acquis %1$d points d\'expérience. </string>
+
+	<string name="monster_difficulty_veryeasy">Très facile</string>
+	<string name="monster_difficulty_easy">Facile</string>
+	<string name="monster_difficulty_normal">Normal</string>
+	<string name="monster_difficulty_hard">Difficile</string>
+	<string name="monster_difficulty_veryhard">Très difficile</string>
+	<string name="monster_difficulty_impossible">Impossible</string>
+
+	<string name="actorinfo_class">Classe :</string>
+	<string name="actorinfo_difficulty">Difficulté :</string>
+	<string name="actorinfo_health">Santé :</string>
+	<string name="actorinfo_attacksperturn">Attaques/tour :</string>
+	<string name="actorinfo_movesperturn">Mouvement/tour :</string>
+	<string name="actorinfo_attack">Attaque :</string>
+	<string name="actorinfo_criticalhit">Coup critique :</string>
+	<string name="actorinfo_defense">Défense :</string>
+	<string name="actorinfo_movecost">Coût de déplacement (AP) :</string>
+	<string name="actorinfo_basetraits">Statistiques de combat de base (sans équipement ni compétences)</string>
+	<string name="actorinfo_currenttraits">Statistiques de combat actuelles</string>
+
+	<string name="traitsinfo_attack_cost">Coût d\'une attaque (AP) :</string>
+	<string name="traitsinfo_attack_chance">Probabilité de toucher :</string>
+	<string name="traitsinfo_attack_damage">Dégâts :</string>
+	<string name="traitsinfo_criticalhit_skill">Probabilité de coup critique :</string>
+	<string name="traitsinfo_criticalhit_multiplier">Coefficient de coup critique :</string>
+	<string name="traitsinfo_defense_chance">Probabilité de bloquer :</string>
+	<string name="traitsinfo_defense_damageresist">Résistance aux dégâts :</string>
+
+	<!-- <string name="key_required">Une clé spécifique est requise pour passer.</string> -->
+
+	<string name="iteminfo_category">Catégorie : </string>
+	<string name="iteminfo_action_use">Utiliser</string>
+	<string name="iteminfo_action_equip">Équiper</string>
+	<string name="iteminfo_action_unequip">Déséquiper</string>
+	<string name="iteminfo_action_use_ap">Utiliser (%1$d AP)</string>
+	<string name="iteminfo_action_equip_ap">Équiper (%1$d AP)</string>
+	<string name="iteminfo_action_unequip_ap">Déséquiper (%1$d AP)</string>
+
+	<string name="itemcategory_money">Argent</string>
+	<string name="itemcategory_weapon">Arme</string>
+	<string name="itemcategory_shield">Bouclier</string>
+	<string name="itemcategory_wearable_head">Vêtement (tête)</string>
+	<string name="itemcategory_wearable_body">Vêtement (corps)</string>
+	<string name="itemcategory_wearable_hand">Vêtement (mains)</string>
+	<string name="itemcategory_wearable_feet">Chaussure (pieds)</string>
+	<string name="itemcategory_wearable_neck">Bijou (cou)</string>
+	<string name="itemcategory_wearable_ring">Bijou (anneau)</string>
+	<string name="itemcategory_potion">Potion</string>
+	<string name="itemcategory_other">Autre</string>
+
+	<string name="startscreen_continue">Continuer la partie en cours</string>
+	<string name="startscreen_newgame">Nouvelle partie</string>
+	<string name="startscreen_newgame_confirm">Vous perdrez votre partie en cours et votre personnage, êtes-vous sûr de vouloir démarrer une nouvelle partie ?</string>
+	<string name="startscreen_about">À propos/aide</string>
+	<string name="startscreen_enterheroname">Entrer le nom du personnage</string>
+	<string name="startscreen_load">Charger</string>
+
+	<!-- <string name="conversation_title">%1$s Dit</string> -->
+	<string name="conversation_rewardexp"> [Vous avez acquis %1$d points d\'expérience]</string>
+	<string name="conversation_rewardgold"> [Vous avez gagné %1$d pièces d\'or]</string>
+	<string name="conversation_lostgold"> [Vous avez perdu %1$d pièces d\'or]</string>
+	<string name="conversation_rewarditem"> [Vous avez gagné un objet]</string>
+	<string name="conversation_rewarditems"> [Vous avez gagné %1$d objets]</string>
+	<string name="conversation_next">Suivant</string>
+	<string name="conversation_leave">Partir</string>
+
+	<string name="shop_buy">Acheter</string>
+	<string name="shop_sell">Vendre</string>
+	<string name="shop_infoitem">Info</string>
+	<string name="shop_buyitem">Acheter (%1$d or)</string>
+	<string name="shop_sellitem">Vendre (%1$d or)</string>
+	<string name="shop_yourgold">Votre or : %1$d</string>
+	<string name="shop_item_bought">%1$s acheté.</string>
+	<string name="shop_item_sold">%1$s vendu.</string>
+
+	<string name="levelup_title">Niveau supérieur</string>
+	<string name="levelup_description">Bienvenue au niveau %1$d !</string>
+	<string name="levelup_buttontext">Niveau supérieur</string>
+	<string name="levelup_add_health">Augmenter les points de vie (+%1$d HP)</string>
+	<string name="levelup_add_health_description">Ajoute %1$d à votre total de points de vie.</string>
+	<string name="levelup_add_attackchance">Augmenter la probabilité de toucher (+%1$d %%)</string>
+	<string name="levelup_add_attackchance_description">Ajoute %1$d%% à votre probabilité de toucher de base.</string>
+	<string name="levelup_add_attackdamage">Augmenter les dégâts (+%1$d)</string>
+	<string name="levelup_add_attackdamage_description">Ajoute %1$d à vos dégâts de base.</string>
+	<string name="levelup_add_blockchance">Augmenter la probabilité de bloquer (+%1$d %%)</string>
+	<string name="levelup_add_blockchance_description">Ajoute %1$d%% à votre probabilité de bloquer de base.</string>
+
+	<string name="dialog_rest_title">Repos</string>
+	<string name="dialog_rest_confirm_message">Voulez-vous vous reposer ici ?</string>
+	<string name="dialog_rest_message">Vous vous êtes bien reposé et êtes prêt à repartir à l\'aventure.</string>
+
+	<string name="about_button1">Aide</string>
+	<string name="about_button2">Auteurs</string>
+	<string name="about_button3">Licence</string>
+	<string name="about_contents1">
+		Merci d\'utiliser La Piste d\'Andor, un jeu de rôle libre pour Android.&lt;br /&gt;
+		&lt;br /&gt;
+		&lt;a href="http://andorstrail.com/"&gt;Forum du jeu andorstrail.com pour les questions et les discussions sur la façon de jouer.&lt;/a&gt;&lt;br /&gt;
+		&lt;br /&gt;
+		&lt;a href="http://andorstrail.com/wiki"&gt;Game wiki for info about the Andor\'s Trail world, among other things.&lt;/a&gt;&lt;br /&gt;
+		&lt;br /&gt;
+		&lt;a href="http://code.google.com/p/andors-trail/"&gt;Page du projet sur code.google.com pour les développeurs.&lt;/a&gt;&lt;br /&gt;
+		&lt;br /&gt;
+		Vous pouvez visiter les forums pour discuter du jeu avec d\'autres joueurs.&lt;br /&gt;
+	</string>
+	<string name="about_contents3">
+		Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le modifier suivant les termes de la « GNU General Public License » telle que publiée par la Free Software Foundation ; soit la version 2 de cette licence, soit (à votre discrétion) une version ultérieure quelconque.&lt;br /&gt;
+		&lt;br /&gt;
+		Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE : sans même la garantie implicite de COMMERCIABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.
+		&lt;br /&gt;
+		Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez : &lt;a href="http://www.gnu.org/licenses"&gt;http://www.gnu.org/licenses&lt;/a&gt;&lt;br /&gt;
+		&lt;br /&gt;
+		Pour toute requête concernant le code source ou les fonctionnalités, veuillez visiter la page du projet : &lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
+	</string>
+
+	<string name="dialog_newversion_title">Bienvenue</string>
+	<string name="dialog_newversion_message">
+		Merci à vous d\'avoir téléchargé La Piste d\'Andor !\n\n
+		Veuillez noter que cette version de La Piste d\'Andor est un TRAVAIL EN COURS, cela signifie que toutes les cartes ne sont pas encore complètes.\n
+		Vous pouvez visiter les forums du projet pour obtenir plus d\'informations ou pour contribuer au projet (voir « À propos »).\n
+		\n
+		Merci pour les retours d\'utilisation !
+	</string>
+
+	<string name="questlog_title">Quêtes</string>
+	<string name="questlog_includecompleted_prompt">Sélectionner les quêtes à afficher</string>
+	<string name="questlog_includecompleted_hidecompleted">Cacher les quêtes terminées</string>
+	<string name="questlog_includecompleted_includecompleted">Inclure les quêtes terminées</string>
+	<string name="questlog_includecompleted_onlycompleted">N\'afficher que les quêtes terminées</string>
+	<string name="questlog_queststatus">État : %1$s</string>
+	<string name="questlog_queststatus_inprogress">En cours</string>
+	<string name="questlog_queststatus_completed">Terminée</string>
+
+	<string name="preferences_display_category">Affichage</string>
+	<string name="preferences_display_fullscreen_title">Plein écran</string>
+	<string name="preferences_display_fullscreen">Affiche le jeu en mode plein écran (nécessite un redémarrage)</string>
+	<string name="preferences_dialog_category">Dialogue de confirmation</string>
+	<string name="preferences_dialog_confirmrest_title">Confirmer le repos</string>
+	<string name="preferences_dialog_confirmrest">Demande si vous voulez vous reposer quand vous êtes sur un lit. Sinon, vous serez toujours automatiquement mis au repos.</string>
+	<string name="preferences_dialog_confirmattack_title">Confirmer les attaques</string>
+	<string name="preferences_dialog_confirmattack">Active la boîte de dialogue « Voulez-vous attaquer ? » quand vous attaquez un monstre.</string>
+	<string name="preferences_dialog_monsterloot_title">Afficher le butin des monstres</string>
+	<string name="preferences_dialog_monsterloot">Change la façon dont s\'affichent les résultats d\'un combat (or, expérience, objets)</string>
+	<string name="preferences_combat_category">Combat</string>
+	<string name="preferences_combat_speed_title">Vitesse des combats</string>
+	<string name="preferences_combat_speed">Détermine la vitesse d\'attaque des monstres.</string>
+
+	<string name="preferences_display_loot_dialog">Afficher la boîte de dialogue des butins</string>
+	<string name="preferences_display_loot_toast">Afficher une simple notification</string>
+	<string name="preferences_display_loot_never">Ne rien afficher</string>
+	<string name="preferences_attackspeed_instant">Instantanée (pas d\'animations)</string>
+	<string name="preferences_attackspeed_fast">Rapide</string>
+	<string name="preferences_attackspeed_normal">Normale</string>
+	<string name="preferences_attackspeed_slow">Lente</string>
+
+	<string name="preferences_movement_category">Déplacement</string>
+	<string name="preferences_movementmethod_title">Méthode de déplacement</string>
+	<string name="preferences_movementmethod">Méthode de déplacement et de gestion des obstacles.</string>
+	<string name="preferences_movementmethods_straight">Tout droit</string>
+	<string name="preferences_movementmethods_avoid">Éviter les obstacles</string>
 
 
-  <!-- =========================================== -->
-  <!-- Added in v0.6.9 -->
+	<!-- =========================================== -->
+	<!-- Added in v0.6.9 -->
 
-  <string name="actorinfo_currentconditions">Conditions actives</string> <!-- Translated as: affliction / statuseffect / temporary effect -->
-  <string name="actorcondition_info_removes_all">Effacer tout %1$s</string>
-  <string name="iteminfo_effect_chance_of">%1$s chance sur %2$s</string>
-  <string name="iteminfo_effect_duration">(%1$d tours)</string>
+	<string name="actorinfo_currentconditions">Conditions actives</string> <!-- Translated as: affliction / statuseffect / temporary effect -->
+	<string name="actorcondition_info_removes_all">Effacer tout %1$s</string>
+	<string name="iteminfo_effect_chance_of">%1$s chance sur %2$s</string>
+	<string name="iteminfo_effect_duration">(%1$d tours)</string>
 
-  <string name="iteminfo_effect_works_on_source">De la source</string>
-  <string name="iteminfo_effect_works_on_target">Sur la cible</string>
-  <string name="iteminfo_effect_works_when_hitting_target">Quand la cible est frappée</string>
-  <string name="iteminfo_effect_works_when_killing_target">À chaque mort</string>
-  <string name="iteminfo_effect_works_when_used">Quand utilisé</string>
-  <string name="iteminfo_effect_works_when_equipped">Quand équipé</string>
-  
-  <string name="iteminfo_effect_decrease_current_hp">Draine %1$s HP</string>
-  <string name="iteminfo_effect_increase_current_hp">Restaure %1$s HP</string>
-  <string name="iteminfo_effect_decrease_current_ap">Draine %1$s AP</string>
-  <string name="iteminfo_effect_increase_current_ap">Restaure %1$s AP</string>
-  
-  <string name="iteminfo_effect_increase_max_hp">Augmenter les HP max. de %1$d</string>
-  <string name="iteminfo_effect_decrease_max_hp">Diminuer les HP max. de %1$d</string>
-  <string name="iteminfo_effect_increase_max_ap">Augmenter les AP max. de %1$d</string>
-  <string name="iteminfo_effect_decrease_max_ap">Diminuer les AP max. de %1$d</string>
-  <string name="iteminfo_effect_increase_movecost">Augmenter le coût de mouvement de %1$d AP</string>
-  <string name="iteminfo_effect_decrease_movecost">Diminuer le coût de mouvement de %1$d AP</string>
-  
-  <!-- La suite est ok -->
+	<string name="iteminfo_effect_works_on_source">De la source</string>
+	<string name="iteminfo_effect_works_on_target">Sur la cible</string>
+	<string name="iteminfo_effect_works_when_hitting_target">Quand la cible est frappée</string>
+	<string name="iteminfo_effect_works_when_killing_target">À chaque mort</string>
+	<string name="iteminfo_effect_works_when_used">Quand utilisé</string>
+	<string name="iteminfo_effect_works_when_equipped">Quand équipé</string>
 
-  <string name="preferences_display_scaling_factor_title">Facteur de zoom</string>
-  <string name="preferences_display_scaling_factor">Permet d\'agrandir toute la zone de jeu</string>
-  <string name="preferences_display_scaling_factor_normal">Taille normale</string>
-  <string name="preferences_display_scaling_factor_50_percent_larger">Zoom de 150%</string>
-  <string name="preferences_display_scaling_factor_double">Zoom de 200%</string>
-  
-  <string name="inventory_assign">Affecter un emplacement rapide</string>
-  <string name="inventory_assign_slot1">Emplacement 1</string>
-  <string name="inventory_assign_slot2">Emplacement 2</string>
-  <string name="inventory_assign_slot3">Emplacement 3</string>
-  <string name="inventory_unassign">Désaffecter un emplacement rapide</string>
+	<string name="iteminfo_effect_decrease_current_hp">Draine %1$s HP</string>
+	<string name="iteminfo_effect_increase_current_hp">Restaure %1$s HP</string>
+	<string name="iteminfo_effect_decrease_current_ap">Draine %1$s AP</string>
+	<string name="iteminfo_effect_increase_current_ap">Restaure %1$s AP</string>
+
+	<string name="iteminfo_effect_increase_max_hp">Augmenter les HP max. de %1$d</string>
+	<string name="iteminfo_effect_decrease_max_hp">Diminuer les HP max. de %1$d</string>
+	<string name="iteminfo_effect_increase_max_ap">Augmenter les AP max. de %1$d</string>
+	<string name="iteminfo_effect_decrease_max_ap">Diminuer les AP max. de %1$d</string>
+	<string name="iteminfo_effect_increase_movecost">Augmenter le coût de mouvement de %1$d AP</string>
+	<string name="iteminfo_effect_decrease_movecost">Diminuer le coût de mouvement de %1$d AP</string>
+
+	<!-- La suite est ok -->
+
+	<string name="preferences_display_scaling_factor_title">Facteur de zoom</string>
+	<string name="preferences_display_scaling_factor">Permet d\'agrandir toute la zone de jeu</string>
+	<string name="preferences_display_scaling_factor_normal">Taille normale</string>
+	<string name="preferences_display_scaling_factor_50_percent_larger">Zoom de 150%</string>
+	<string name="preferences_display_scaling_factor_double">Zoom de 200%</string>
+
+	<string name="inventory_assign">Affecter un emplacement rapide</string>
+	<string name="inventory_assign_slot1">Emplacement 1</string>
+	<string name="inventory_assign_slot2">Emplacement 2</string>
+	<string name="inventory_assign_slot3">Emplacement 3</string>
+	<string name="inventory_unassign">Désaffecter un emplacement rapide</string>
 
 
-  <!-- =========================================== -->
-  <!-- Added in v0.6.10 -->
-  
-  <string name="preferences_movement_dpad_position_title">Croix directionnelle (D-pad) virtuelle</string>
-  <string name="preferences_movement_dpad_position">Active une croix directionnelle virtuelle sur l\'écran pour guider les déplacements</string>
-  <string name="preferences_movement_dpad_minimizeable_title">Minimisation de la croix directionnelle virtuelle</string>
-  <string name="preferences_movement_dpad_minimizeable">Si la croix directionnelle virtuelle est activée, ce réglage permet de la réduire en pressant son centre.</string>
-  
-  <string name="preferences_movement_dpad_positions_disabled">Désactivée</string>
-  <string name="preferences_movement_dpad_positions_lower_right">En bas à droite</string>
-  <string name="preferences_movement_dpad_positions_lower_left">En bas à gauche</string>
-  <string name="preferences_movement_dpad_positions_center_bottom">Centrée en bas</string>
-  <string name="preferences_movement_dpad_positions_center_left">Centrée à gauche</string>
-  <string name="preferences_movement_dpad_positions_center_right">Centrée à droite</string>
-  <string name="preferences_movement_dpad_positions_upper_left">En haut à gauche</string>
-  <string name="preferences_movement_dpad_positions_upper_right">En haut à droite</string>
-  <string name="preferences_movement_dpad_positions_center_top">Centrée en haut</string>
-  
-  <string name="actorconditioninfo_constant_effect">Effet continu</string>
-  <string name="actorconditioninfo_effect_every_round">À chaque tour</string>
-  <string name="actorconditioninfo_effect_every_full_round">À chaque tour complet</string>
-  <string name="bulkselection_totalcost_buy">Prix total : %1$d or</string>
-  <string name="bulkselection_totalcost_sell">Prix total : %1$d or</string>
-  <string name="bulkselection_select_all">Tout</string>
-  <string name="bulkselection_sell_confirmation_title">Êtes-vous sûr ?</string>
-  <string name="bulkselection_sell_confirmation">Êtes-vous sûr de vouloir vendre %1$s ? Cet objet est %2$s et vous pourriez ne plus être à même de le retrouver.</string>
-  
-  <string name="skill_title_weapon_chance">Précision</string>
-  <string name="skill_title_weapon_dmg">Gros bras</string>
-  <string name="skill_title_barter">Marchandage</string>
-  <string name="skill_title_dodge">Esquive</string>
-  <string name="skill_title_barkskin">Peau de fer</string>
-  <string name="skill_title_more_criticals">Concentration</string>
-  <string name="skill_title_better_criticals">Œil de lynx</string>
-  <string name="skill_title_speed">Rapidité</string>
-  <string name="skill_title_coinfinder">Chasseur de trésor</string>
-  <string name="skill_title_more_exp">Apprentissage accéléré</string>
-  <string name="skill_title_cleave">Vivacité</string>
-  <string name="skill_title_eater">Charognard</string>
-  <string name="skill_title_fortitude">Constitution améliorée</string>
-  <string name="skill_title_evasion">Évasion</string>
-  <string name="skill_title_regeneration">Régénération</string>
-  <string name="skill_title_lower_exploss">Maîtrise de l\'échec</string>
-  <string name="skill_title_magicfinder">Chercheur de magie</string>
-  <string name="skill_title_resistance_mental">Force mentale</string>
-  <string name="skill_title_resistance_physical_capacity">Endurance physique</string>
-  <string name="skill_title_resistance_blood_disorder">Sang pur</string>
-  
-  <string name="skill_shortdescription_weapon_chance">Augmente la probabilité de toucher</string>
-  <string name="skill_shortdescription_weapon_dmg">Augmente les dégâts</string>
-  <string name="skill_shortdescription_barter">Prix d\'achat et de vente plus intéressants</string>
-  <string name="skill_shortdescription_dodge">Augmente la probabilité de bloquer</string>
-  <string name="skill_shortdescription_barkskin">Augmente la résistance aux dégâts</string>
-  <string name="skill_shortdescription_more_criticals">Augmente la probabilité de porter des coups critiques</string>
-  <string name="skill_shortdescription_better_criticals">Augmente les dégâts infligés par un coup critique</string>
-  <string name="skill_shortdescription_speed">Augmente le nombre maximal de points d\'action</string>
-  <string name="skill_shortdescription_coinfinder">Permet de trouver plus d\'or</string>
-  <string name="skill_shortdescription_more_exp">Les monstres tués rapportent plus d\'expérience</string>
-  <string name="skill_shortdescription_cleave">Permet de récupérer des points d\'action en tuant un monstre</string>
-  <string name="skill_shortdescription_eater">Récupération de points de vie à chaque monstre tué</string>
-  <string name="skill_shortdescription_fortitude">Augmentation des points de vie max. à chaque changement de niveau</string>
-  <string name="skill_shortdescription_evasion">Améliore les chances de s\'enfuir</string>
-  <string name="skill_shortdescription_regeneration">Permet de récupérer des points de vie à chaque tour</string>
-  <string name="skill_shortdescription_lower_exploss">Réduction de la perte d\'expérience en cas de décès</string>
-  <string name="skill_shortdescription_magicfinder">Augmentation de la chance de trouver des objets magiques</string>
-  <string name="skill_shortdescription_resistance_mental">Résistance aux troubles mentaux</string>
-  <string name="skill_shortdescription_resistance_physical_capacity">Résistance aux troubles physiques</string>
-  <string name="skill_shortdescription_resistance_blood_disorder">Résistance aux troubles sanguins</string>
-  
-  <string name="skill_longdescription_weapon_chance">Chaque niveau de compétence augmente la probabilité de toucher de %1$d.</string>
-  <string name="skill_longdescription_weapon_dmg">Chaque niveau de compétence augmente les dommages min. et max. de %1$d.</string>
-  <string name="skill_longdescription_barter">Chaque niveau de compétence réduit le malus financier d\'achat et de vente de %1$d %%.</string>
-  <string name="skill_longdescription_dodge">Chaque niveau de compétence augmente la chance de bloquer de %1$d.</string>
-  <string name="skill_longdescription_barkskin">Chaque niveau de compétence augmente la résistance aux dégâts de %1$d.</string>
-  <string name="skill_longdescription_more_criticals">Chaque niveau de compétence augmente la probabilité d\'infliger un coup critique de %1$d %%. Attention, ce pourcentage est relatif à la probabilité déjà existante (équipement, ...), ce n\'est pas un pourcentage absolu.</string>
-  <string name="skill_longdescription_better_criticals">Chaque niveau de compétence augmente le facteur multiplicatif de coups critiques existant (donné par l\'équipement) de %1$d %%.</string>
-  <string name="skill_longdescription_speed">Chaque niveau de compétence augmente le nombre maximal de points d\'action (AP) de %1$d.</string>
-  <string name="skill_longdescription_coinfinder">Chaque niveau de compétence augmente les chances de trouver de l\'or dans les butins de monstres de %1$d %%, et augmente le montant d\'or trouvé de %2$d %% (jusqu\'à atteindre le montant maximum propre à chaque monstre).</string>
-  <string name="skill_longdescription_more_exp">Chaque niveau de compétence augmente le nombre de points d\'expérience acquis en tuant un monstre de %1$d %%.</string>
-  <string name="skill_longdescription_cleave">Chaque niveau de compétence redonne %1$d points d\'action (AP) pour chaque monstre tué.</string>
-  <string name="skill_longdescription_eater">Chaque niveau de compétence redonne %1$d points de vie (HP) pour chaque monstre tué.</string>
-  <string name="skill_longdescription_fortitude">Chaque changement de niveau ultérieur augmente le nombre maximal de points de vie (HP) de %1$d par niveau de compétence. Ceci n\'est pas appliqué rétroactivement, seuls les changements de niveau ultérieurs sont affectés.</string>
-  <string name="skill_longdescription_evasion">Chaque niveau de compétence réduit la probabilité de ne pas pouvoir fuir de %1$d %%, ainsi que la probabilité qu\'un monstre proche attaque de %2$d %%.</string>
-  <string name="skill_longdescription_regeneration">Permet de récupérer +%1$d points de vie (HP) par niveau de compétence à chaque tour.</string>
-  <string name="skill_longdescription_lower_exploss">Chaque niveau de compétence réduit la quantité d\'expérience perdue en cas de décès de %1$d %% (pourcentage relatif à la perte existante et non pourcentage absolu). Le niveau %2$d de ce talent enlève toute perte d\'expérience au décès.</string>
-  <string name="skill_longdescription_magicfinder">Chaque niveau de compétence augmente la probabilité de trouver des objets non-ordinaires de %1$d %%.</string>
-  <string name="skill_longdescription_resistance_mental">Chaque niveau de compétence diminue la probabilité d\'être affecté par des troubles mentaux de %1$d %%, jusqu\'à un maximum de %2$d %%. Cela inclut les troubles causés par les monstres comme Étourdissement ou Maladresse.</string>
-  <string name="skill_longdescription_resistance_physical_capacity">Chaque niveau de compétence diminue la probabilité d\'être affecté par des troubles physiques de %1$d %%, jusqu\'à un maximum de %2$d %%. Ceci inclut les troubles causés par les monstres comme Fatigue.</string>
-  <string name="skill_longdescription_resistance_blood_disorder">Chaque niveau de compétence diminue la probabilité d\'être affecté par des troubles sanguins de %1$d %%, jusqu\'à un maximum de %2$d %%. Ceci inclut les troubles causés par les monstres comme Poison ou Blessures saignantes.</string>
-  
-  <string name="skillinfo_action_levelup">Changement de niveau</string>
-  <string name="skill_current_level">Niveau courant : %1$d</string>
-  <string name="skill_current_level_with_maximum">Niveau courant : %1$d / %2$d</string>
-  <string name="skill_prerequisite_other_skill">Pour améliorer cette compétence, vous devez atteindre au moins le niveau %1$d de la compétence %2$s.</string>
-  <string name="skill_prerequisite_level">Pour améliorer cette compétence, vous devez atteindre au moins le niveau %1$d.</string>
-  <string name="skill_prerequisite_stat">Pour améliorer cette compétence, vous devez avoir au moins %1$d %2$s (statistiques de base).</string>
-  <string name="skill_number_of_increases_one">Vous pouvez sélectionner une compétence à améliorer.</string>
-  <string name="skill_number_of_increases_several">Vous pouvez sélectionner %1$d compétences à améliorer.</string>
-  <string name="levelup_adds_new_skillpoint">Ce niveau vous donne également un nouveau point de compétence à utiliser !</string>
+	<!-- =========================================== -->
+	<!-- Added in v0.6.10 -->
+
+	<string name="preferences_movement_dpad_position_title">Croix directionnelle (D-pad) virtuelle</string>
+	<string name="preferences_movement_dpad_position">Active une croix directionnelle virtuelle sur l\'écran pour guider les déplacements</string>
+	<string name="preferences_movement_dpad_minimizeable_title">Minimisation de la croix directionnelle virtuelle</string>
+	<string name="preferences_movement_dpad_minimizeable">Si la croix directionnelle virtuelle est activée, ce réglage permet de la réduire en pressant son centre.</string>
+
+	<string name="preferences_movement_dpad_positions_disabled">Désactivée</string>
+	<string name="preferences_movement_dpad_positions_lower_right">En bas à droite</string>
+	<string name="preferences_movement_dpad_positions_lower_left">En bas à gauche</string>
+	<string name="preferences_movement_dpad_positions_center_bottom">Centrée en bas</string>
+	<string name="preferences_movement_dpad_positions_center_left">Centrée à gauche</string>
+	<string name="preferences_movement_dpad_positions_center_right">Centrée à droite</string>
+	<string name="preferences_movement_dpad_positions_upper_left">En haut à gauche</string>
+	<string name="preferences_movement_dpad_positions_upper_right">En haut à droite</string>
+	<string name="preferences_movement_dpad_positions_center_top">Centrée en haut</string>
+
+	<string name="actorconditioninfo_constant_effect">Effet continu</string>
+	<string name="actorconditioninfo_effect_every_round">À chaque tour</string>
+	<string name="actorconditioninfo_effect_every_full_round">À chaque tour complet</string>
+	<string name="bulkselection_totalcost_buy">Prix total : %1$d or</string>
+	<string name="bulkselection_totalcost_sell">Prix total : %1$d or</string>
+	<string name="bulkselection_select_all">Tout</string>
+	<string name="bulkselection_sell_confirmation_title">Êtes-vous sûr ?</string>
+	<string name="bulkselection_sell_confirmation">Êtes-vous sûr de vouloir vendre %1$s ? Cet objet est %2$s et vous pourriez ne plus être à même de le retrouver.</string>
+
+	<string name="skill_title_weapon_chance">Précision</string>
+	<string name="skill_title_weapon_dmg">Gros bras</string>
+	<string name="skill_title_barter">Marchandage</string>
+	<string name="skill_title_dodge">Esquive</string>
+	<string name="skill_title_barkskin">Peau de fer</string>
+	<string name="skill_title_more_criticals">Concentration</string>
+	<string name="skill_title_better_criticals">Œil de lynx</string>
+	<string name="skill_title_speed">Rapidité</string>
+	<string name="skill_title_coinfinder">Chasseur de trésor</string>
+	<string name="skill_title_more_exp">Apprentissage accéléré</string>
+	<string name="skill_title_cleave">Vivacité</string>
+	<string name="skill_title_eater">Charognard</string>
+	<string name="skill_title_fortitude">Constitution améliorée</string>
+	<string name="skill_title_evasion">Évasion</string>
+	<string name="skill_title_regeneration">Régénération</string>
+	<string name="skill_title_lower_exploss">Maîtrise de l\'échec</string>
+	<string name="skill_title_magicfinder">Chercheur de magie</string>
+	<string name="skill_title_resistance_mental">Force mentale</string>
+	<string name="skill_title_resistance_physical_capacity">Endurance physique</string>
+	<string name="skill_title_resistance_blood_disorder">Sang pur</string>
+
+	<string name="skill_shortdescription_weapon_chance">Augmente la probabilité de toucher</string>
+	<string name="skill_shortdescription_weapon_dmg">Augmente les dégâts</string>
+	<string name="skill_shortdescription_barter">Prix d\'achat et de vente plus intéressants</string>
+	<string name="skill_shortdescription_dodge">Augmente la probabilité de bloquer</string>
+	<string name="skill_shortdescription_barkskin">Augmente la résistance aux dégâts</string>
+	<string name="skill_shortdescription_more_criticals">Augmente la probabilité de porter des coups critiques</string>
+	<string name="skill_shortdescription_better_criticals">Augmente les dégâts infligés par un coup critique</string>
+	<string name="skill_shortdescription_speed">Augmente le nombre maximal de points d\'action</string>
+	<string name="skill_shortdescription_coinfinder">Permet de trouver plus d\'or</string>
+	<string name="skill_shortdescription_more_exp">Les monstres tués rapportent plus d\'expérience</string>
+	<string name="skill_shortdescription_cleave">Permet de récupérer des points d\'action en tuant un monstre</string>
+	<string name="skill_shortdescription_eater">Récupération de points de vie à chaque monstre tué</string>
+	<string name="skill_shortdescription_fortitude">Augmentation des points de vie max. à chaque changement de niveau</string>
+	<string name="skill_shortdescription_evasion">Améliore les chances de s\'enfuir</string>
+	<string name="skill_shortdescription_regeneration">Permet de récupérer des points de vie à chaque tour</string>
+	<string name="skill_shortdescription_lower_exploss">Réduction de la perte d\'expérience en cas de décès</string>
+	<string name="skill_shortdescription_magicfinder">Augmentation de la chance de trouver des objets magiques</string>
+	<string name="skill_shortdescription_resistance_mental">Résistance aux troubles mentaux</string>
+	<string name="skill_shortdescription_resistance_physical_capacity">Résistance aux troubles physiques</string>
+	<string name="skill_shortdescription_resistance_blood_disorder">Résistance aux troubles sanguins</string>
+
+	<string name="skill_longdescription_weapon_chance">Chaque niveau de compétence augmente la probabilité de toucher de %1$d.</string>
+	<string name="skill_longdescription_weapon_dmg">Chaque niveau de compétence augmente les dommages min. et max. de %1$d.</string>
+	<string name="skill_longdescription_barter">Chaque niveau de compétence réduit le malus financier d\'achat et de vente de %1$d %%.</string>
+	<string name="skill_longdescription_dodge">Chaque niveau de compétence augmente la chance de bloquer de %1$d.</string>
+	<string name="skill_longdescription_barkskin">Chaque niveau de compétence augmente la résistance aux dégâts de %1$d.</string>
+	<string name="skill_longdescription_more_criticals">Chaque niveau de compétence augmente la probabilité d\'infliger un coup critique de %1$d %%. Attention, ce pourcentage est relatif à la probabilité déjà existante (équipement, ...), ce n\'est pas un pourcentage absolu.</string>
+	<string name="skill_longdescription_better_criticals">Chaque niveau de compétence augmente le facteur multiplicatif de coups critiques existant (donné par l\'équipement) de %1$d %%.</string>
+	<string name="skill_longdescription_speed">Chaque niveau de compétence augmente le nombre maximal de points d\'action (AP) de %1$d.</string>
+	<string name="skill_longdescription_coinfinder">Chaque niveau de compétence augmente les chances de trouver de l\'or dans les butins de monstres de %1$d %%, et augmente le montant d\'or trouvé de %2$d %% (jusqu\'à atteindre le montant maximum propre à chaque monstre).</string>
+	<string name="skill_longdescription_more_exp">Chaque niveau de compétence augmente le nombre de points d\'expérience acquis en tuant un monstre de %1$d %%.</string>
+	<string name="skill_longdescription_cleave">Chaque niveau de compétence redonne %1$d points d\'action (AP) pour chaque monstre tué.</string>
+	<string name="skill_longdescription_eater">Chaque niveau de compétence redonne %1$d points de vie (HP) pour chaque monstre tué.</string>
+	<string name="skill_longdescription_fortitude">Chaque changement de niveau ultérieur augmente le nombre maximal de points de vie (HP) de %1$d par niveau de compétence. Ceci n\'est pas appliqué rétroactivement, seuls les changements de niveau ultérieurs sont affectés.</string>
+	<string name="skill_longdescription_evasion">Chaque niveau de compétence réduit la probabilité de ne pas pouvoir fuir de %1$d %%, ainsi que la probabilité qu\'un monstre proche attaque de %2$d %%.</string>
+	<string name="skill_longdescription_regeneration">Permet de récupérer +%1$d points de vie (HP) par niveau de compétence à chaque tour.</string>
+	<string name="skill_longdescription_lower_exploss">Chaque niveau de compétence réduit la quantité d\'expérience perdue en cas de décès de %1$d %% (pourcentage relatif à la perte existante et non pourcentage absolu). Le niveau %2$d de ce talent enlève toute perte d\'expérience au décès.</string>
+	<string name="skill_longdescription_magicfinder">Chaque niveau de compétence augmente la probabilité de trouver des objets non-ordinaires de %1$d %%.</string>
+	<string name="skill_longdescription_resistance_mental">Chaque niveau de compétence diminue la probabilité d\'être affecté par des troubles mentaux de %1$d %%, jusqu\'à un maximum de %2$d %%. Cela inclut les troubles causés par les monstres comme Étourdissement ou Maladresse.</string>
+	<string name="skill_longdescription_resistance_physical_capacity">Chaque niveau de compétence diminue la probabilité d\'être affecté par des troubles physiques de %1$d %%, jusqu\'à un maximum de %2$d %%. Ceci inclut les troubles causés par les monstres comme Fatigue.</string>
+	<string name="skill_longdescription_resistance_blood_disorder">Chaque niveau de compétence diminue la probabilité d\'être affecté par des troubles sanguins de %1$d %%, jusqu\'à un maximum de %2$d %%. Ceci inclut les troubles causés par les monstres comme Poison ou Blessures saignantes.</string>
+
+	<string name="skillinfo_action_levelup">Changement de niveau</string>
+	<string name="skill_current_level">Niveau courant : %1$d</string>
+	<string name="skill_current_level_with_maximum">Niveau courant : %1$d / %2$d</string>
+	<string name="skill_prerequisite_other_skill">Pour améliorer cette compétence, vous devez atteindre au moins le niveau %1$d de la compétence %2$s.</string>
+	<string name="skill_prerequisite_level">Pour améliorer cette compétence, vous devez atteindre au moins le niveau %1$d.</string>
+	<string name="skill_prerequisite_stat">Pour améliorer cette compétence, vous devez avoir au moins %1$d %2$s (statistiques de base).</string>
+	<string name="skill_number_of_increases_one">Vous pouvez sélectionner une compétence à améliorer.</string>
+	<string name="skill_number_of_increases_several">Vous pouvez sélectionner %1$d compétences à améliorer.</string>
+	<string name="levelup_adds_new_skillpoint">Ce niveau vous donne également un nouveau point de compétence à utiliser !</string>
+
+	<string name="loadsave_save_to_new_slot">Créer un nouvel emplacement de sauvegarde</string>
+	<string name="loadsave_save_overwrite_confirmation_title">Écraser la sauvegarde ?</string>
+	<string name="loadsave_save_overwrite_confirmation">Cette sauvegarde contient un nom de personnage différent (%1$s) de votre nom actuel (%2$s). Êtes-vous sûr de vouloir écraser cette sauvegarde ?</string>
+
+	<string name="iteminfo_displaytypes_ordinary">Ordinaire</string>
+	<string name="iteminfo_displaytypes_quest">Objet de quête</string>
+	<string name="iteminfo_displaytypes_legendary">Légendaire</string>
+	<string name="iteminfo_displaytypes_extraordinary">Extraordinaire</string>
+	<string name="iteminfo_displaytypes_rare">Rare</string>
+
+	<string name="actorconditioninfo_category">Types de troubles : %1$s</string>
+	<string name="actorcondition_categories_spiritual">Spirituel</string>
+	<string name="actorcondition_categories_mental">Mental</string>
+	<string name="actorcondition_categories_physical">Capacité physique</string>
+	<string name="actorcondition_categories_blood">Trouble sanguin</string>
+
+	<string name="traitsinfo_base_max_hp">HP max. :</string>
+	<string name="traitsinfo_base_max_ap">AP max. :</string>
+	<string name="menu_save_saving_not_allowed_in_combat">Impossible de faire une sauvegarde du jeu au cours d\'un combat.</string>
+
+	<string name="preferences_optimized_drawing_title">Affichage optimisé</string>
+	<string name="preferences_optimized_drawing">Désactivez cette option si vous voyez des artefacts graphiques. Lorsque cette option est activée, seules les parties de l\'écran ayant changées sont redessinées lors du rafraîchissement.</string>
+
+	<!-- =========================================== -->
+	<!-- Added in v0.6.11 -->
+
+	<string name="skill_title_shadow_bless">Bénédiction de l\'Ombre</string>
+	<string name="skill_shortdescription_shadow_bless">Résistance contre tous les types de trouble</string>
+	<string name="skill_longdescription_shadow_bless">Chaque niveau de compétence diminue la probabilité d\'être affecté par n\'importe quel type de trouble de %1$d %%. Cela englobe tous les troubles causés par les monstres, comme Poison, Étourdissement ou Fatigue.</string>
+
+	<string name="inventory_movetop">Déplacer en haut</string>
+	<string name="inventory_movebottom">Déplacer en bas</string>
+	<string name="actorinfo_immune_criticals">Immunise contre les coups critiques</string>
+	<string name="traitsinfo_criticalhit_effectivechance">Taux de coups critiques : </string>
 
-  <string name="loadsave_save_to_new_slot">Créer un nouvel emplacement de sauvegarde</string>
-  <string name="loadsave_save_overwrite_confirmation_title">Écraser la sauvegarde ?</string>
-  <string name="loadsave_save_overwrite_confirmation">Cette sauvegarde contient un nom de personnage différent (%1$s) de votre nom actuel (%2$s). Êtes-vous sûr de vouloir écraser cette sauvegarde ?</string> 
-  
-  <string name="iteminfo_displaytypes_ordinary">Ordinaire</string>
-  <string name="iteminfo_displaytypes_quest">Objet de quête</string>
-  <string name="iteminfo_displaytypes_legendary">Légendaire</string>
-  <string name="iteminfo_displaytypes_extraordinary">Extraordinaire</string>
-  <string name="iteminfo_displaytypes_rare">Rare</string>
-  
-  <string name="actorconditioninfo_category">Types de troubles : %1$s</string>
-  <string name="actorcondition_categories_spiritual">Spirituel</string>
-  <string name="actorcondition_categories_mental">Mental</string>
-  <string name="actorcondition_categories_physical">Capacité physique</string>
-  <string name="actorcondition_categories_blood">Trouble sanguin</string>
-  
-  <string name="traitsinfo_base_max_hp">HP max. :</string>
-  <string name="traitsinfo_base_max_ap">AP max. :</string>
-  <string name="menu_save_saving_not_allowed_in_combat">Impossible de faire une sauvegarde du jeu au cours d\'un combat.</string>
-  
-  <string name="preferences_optimized_drawing_title">Affichage optimisé</string>
-  <string name="preferences_optimized_drawing">Désactivez cette option si vous voyez des artefacts graphiques. Lorsque cette option est activée, seules les parties de l\'écran ayant changées sont redessinées lors du rafraîchissement.</string>
-  
-  <!-- =========================================== -->
-  <!-- Added in v0.6.11 -->
-	
-  <string name="skill_title_shadow_bless">Bénédiction de l\'Ombre</string>
-  <string name="skill_shortdescription_shadow_bless">Résistance contre tous les types de trouble</string>
-  <string name="skill_longdescription_shadow_bless">Chaque niveau de compétence diminue la probabilité d\'être affecté par n\'importe quel type de trouble de %1$d %%. Cela englobe tous les troubles causés par les monstres, comme Poison, Étourdissement ou Fatigue.</string>
-  
-  <string name="inventory_movetop">Déplacer en haut</string>
-  <string name="inventory_movebottom">Déplacer en bas</string>
-  <string name="actorinfo_immune_criticals">Immunise contre les coups critiques</string>
-  <string name="traitsinfo_criticalhit_effectivechance">Taux de coups critiques : </string>
-  
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
-	
+
 	<string name="localize_resources_from_mo_filename">fr.mo</string>
 </resources>
diff --git a/AndorsTrail/res/values-it/strings.xml b/AndorsTrail/res/values-it/strings.xml
index 373bbc94c..fb0093356 100644
--- a/AndorsTrail/res/values-it/strings.xml
+++ b/AndorsTrail/res/values-it/strings.xml
@@ -1,298 +1,298 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <resources>
-        <string name="app_name">Andor\'s Trail</string>
-       
-        <string name="exit">Esci</string>
-        <string name="exit_to_menu">Menu</string>
-        <string name="menu_pause">Pausa</string>
-        <string name="menu_settings">Opzioni</string>
-        <string name="menu_save">Salva</string>
-        <string name="menu_load">Carica</string>
-        <string name="menu_save_gamesaved">Partita salvata sullo slot %1$d</string>
-        <string name="menu_save_failed">Impossibile salvare! La sceda SD è caricata e scrivibile?</string>
+	<string name="app_name">Andor\'s Trail</string>
 
-        <string name="loadsave_title_save">Salva gioco</string>
-        <string name="loadsave_title_load">Carica salvataggio</string>
-        <string name="loadsave_selectslot">Scegli Slot</string>
-        <string name="loadsave_slot_empty">(Vuoto)</string>
-        <string name="savegame_currenthero_displayinfo">Livello %1$d, %2$d esp, %3$d oro</string>
-       
-        <string name="dialog_loading_message">Carica risorse...</string>
-        <string name="dialog_loading_failed_title">Caricamento fallito</string>
-        <string name="dialog_loading_failed_message">Andor\'s Trail non ha caricato il salvataggio.\n\n:(\n\nIl file può essere incompleto o danneggiato)</string>
-        <string name="dialog_loading_failed_incorrectversion">Andor\'s Trail non ha caricato il salvataggio. Il salvataggio è stato creato con una versione precedente di quella installata.</string>
-       
-        <string name="dialog_close">Chiudi</string>
-       
-        <string name="dialog_confirmexit_title">Esci</string>
-        <string name="dialog_confirmexit_message">Sei sicuro di voler uscire?</string>
-       
-        <string name="dialog_paused_title">Pausa</string>
-        <string name="dialog_paused_message">Il gioco è in pausa</string>
-        <string name="dialog_paused_resume">Riprendi</string>
+	<string name="exit">Esci</string>
+	<string name="exit_to_menu">Menu</string>
+	<string name="menu_pause">Pausa</string>
+	<string name="menu_settings">Opzioni</string>
+	<string name="menu_save">Salva</string>
+	<string name="menu_load">Carica</string>
+	<string name="menu_save_gamesaved">Partita salvata sullo slot %1$d</string>
+	<string name="menu_save_failed">Impossibile salvare! La sceda SD è caricata e scrivibile?</string>
 
-        <string name="dialog_monsterencounter_title">Combattimento</string>
-        <string name="dialog_monsterencounter_message">Vuoi attaccare? Difficoltà: %1$s</string>
-        <string name="dialog_monsterencounter_info">Info</string>
+	<string name="loadsave_title_save">Salva gioco</string>
+	<string name="loadsave_title_load">Carica salvataggio</string>
+	<string name="loadsave_selectslot">Scegli Slot</string>
+	<string name="loadsave_slot_empty">(Vuoto)</string>
+	<string name="savegame_currenthero_displayinfo">Livello %1$d, %2$d esp, %3$d oro</string>
 
-        <string name="status_hp">HP:</string>
-        <string name="status_mp">MP:</string>
-        <string name="status_ap">AP:</string>
-        <string name="status_exp">Livello:</string>
+	<string name="dialog_loading_message">Carica risorse...</string>
+	<string name="dialog_loading_failed_title">Caricamento fallito</string>
+	<string name="dialog_loading_failed_message">Andor\'s Trail non ha caricato il salvataggio.\n\n:(\n\nIl file può essere incompleto o danneggiato)</string>
+	<string name="dialog_loading_failed_incorrectversion">Andor\'s Trail non ha caricato il salvataggio. Il salvataggio è stato creato con una versione precedente di quella installata.</string>
 
-        <string name="heroinfo_char">Panoramica</string>
-        <string name="heroinfo_inv">Inventario</string>
-        <string name="heroinfo_wear">Equipaggiamento</string>
-        <string name="heroinfo_skill">Abilità</string>
-        <string name="heroinfo_spell">Incantesimi</string>
-        <string name="heroinfo_levelup">Nuovo Livello</string>
-        <string name="heroinfo_level">Livello</string>
-        <string name="heroinfo_totalexperience">Esperienza Totale</string>
-        <string name="heroinfo_wornequipment">Equipaggiamento indossato</string>
-        <string name="heroinfo_inventory">Inventario</string>
-        <string name="heroinfo_gold">Oro: %1$d</string>
-        <string name="heroinfo_actionpoints">Punti azione (AP):</string>
-        <string name="heroinfo_quests">Missioni</string>
-       
-        <string name="combat_attack">Attacco (%1$d AP)</string>
-        <string name="combat_move">Movimento (%1$d AP)</string>
-        <string name="combat_use">Usare oggetti</string>
-        <string name="combat_spell">Incantesimo</string>
-        <string name="combat_endturn">Fine turno</string>
-        <!-- <string name="combat_endcombat">End combat</string>-->
-        <string name="combat_flee">Fuggi</string>
-        <string name="combat_begin_flee">Ora puoi fuggire dal combattimento cliccando nella direzione in cui vuoi fuggire.</string>
-        <string name="combat_flee_failed">La tua fuga è fallita!</string>
-        <string name="combat_status_ap">AP: %1$d</string>
-        <string name="combat_monsterhealth">HP:</string>
-        <string name="combat_monsteraction">%1$s sta attaccando.</string>
-        <!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat.</string>  -->
-        <string name="combat_result_monstermiss">%1$s manca il colpo!</string>
-        <string name="combat_result_monsterhit">%1$s colpisce per %2$d hp!</string>
-        <string name="combat_result_monsterhitcritical">%1$s effettua un colpo critico per %2$d hp!</string>
-        <string name="combat_result_heromiss">Il tuo attacco è fallito.</string>
-        <string name="combat_result_herohit">Hai colpito %1$s per %2$d hp!</string>
-        <string name="combat_result_herohitcritical">Sferri un colpo critico %1$s per %2$d hp!</string>
-        <string name="combat_result_herokillsmonster">%1$s muore!</string>
-        <string name="combat_not_enough_ap">Non hai abbastanza AP attendi il prossimo turno.</string>
-        <string name="combat_hero_dies">Cadi svenuto ma fortunatamente ti risvegli vivo. Hai perso %1$d esperienza.</string>
-               
-        <string name="inventory_info">Info</string>
-        <string name="inventory_equip">Oggetti in uso</string>
-        <string name="inventory_unequip">Oggetti non usati</string>
-        <string name="inventory_use">Usa</string>
-        <string name="inventory_drop">Scarica</string>
-        <string name="inventory_item_used">Hai usato %1$s.</string>
-        <string name="inventory_item_dropped">%1$s è stato abbandonato.</string>
-        <string name="inventory_item_equipped">Stai usando %1$s.</string>
+	<string name="dialog_close">Chiudi</string>
 
-        <string name="dialog_loot_pickall">Raccogli tutto</string>
-        <string name="dialog_loot_foundgold">Hai %1$d Oro. </string>
-        <string name="dialog_loot_pickedupitems">Hai raccolto %1$d oggetti.</string>
-        <string name="dialog_groundloot_title">Oggetti</string>
-        <string name="dialog_groundloot_message">Hai trovato alcuni oggetti. </string>
-        <string name="dialog_monsterloot_title">Vittoria</string>
-        <string name="dialog_monsterloot_message">Sei sopravvissuto all\'incontro.</string>
-        <string name="dialog_monsterloot_gainedexp">Hai aumentato %1$d di esperienza.</string>
-   
-    <string name="monster_difficulty_veryeasy">Facilissimo</string>
-    <string name="monster_difficulty_easy">Facile</string>
-    <string name="monster_difficulty_normal">Normale</string>
-    <string name="monster_difficulty_hard">Difficile</string>
-    <string name="monster_difficulty_veryhard">Difficilissimo</string>
-    <string name="monster_difficulty_impossible">Impossibile</string>
+	<string name="dialog_confirmexit_title">Esci</string>
+	<string name="dialog_confirmexit_message">Sei sicuro di voler uscire?</string>
 
-    <string name="actorinfo_class">Classe:</string>
-    <string name="actorinfo_difficulty">Difficoltà:</string>
-    <string name="actorinfo_health">Salute:</string>
-    <string name="actorinfo_attacksperturn">Attacchi/turno:</string>
-    <string name="actorinfo_movesperturn">Movementi/turno:</string>
-    <string name="actorinfo_attack">Attacco:</string>
-    <string name="actorinfo_criticalhit">Colpo critico:</string>
-    <string name="actorinfo_defense">Difesa:</string>
-    <string name="actorinfo_movecost">Costo mossa (AP):</string>
-    <string name="actorinfo_basetraits">Statistiche oggetti non indossati (base)</string>
-    <string name="actorinfo_currenttraits">Statistiche oggetti indossati (correnti)</string>
-   
-    <string name="traitsinfo_attack_cost">Costo attacco (AP):</string>
-    <string name="traitsinfo_attack_chance">Possibilità attacco:</string>
-    <string name="traitsinfo_attack_damage">Possibilità danni:</string>
-    <string name="traitsinfo_criticalhit_skill">colpo critico:</string>
-    <string name="traitsinfo_criticalhit_multiplier">moltiplicatore critico:</string>
-    <string name="traitsinfo_defense_chance">Possibilità difesa:</string>
-    <string name="traitsinfo_defense_damageresist">Resistenza ai danni:</string>
-   
-        <!-- <string name="key_required">E\' richiesta una chiave specifica per passare.</string> -->
+	<string name="dialog_paused_title">Pausa</string>
+	<string name="dialog_paused_message">Il gioco è in pausa</string>
+	<string name="dialog_paused_resume">Riprendi</string>
 
-        <string name="iteminfo_category">Categoria: </string>
-        <string name="iteminfo_action_use">Usa</string>
-        <string name="iteminfo_action_equip">Indossa</string>
-        <string name="iteminfo_action_unequip">Togli</string>
-        <string name="iteminfo_action_use_ap">Usa (%1$d AP)</string>
-        <string name="iteminfo_action_equip_ap">Indossa (%1$d AP)</string>
-        <string name="iteminfo_action_unequip_ap">Togli (%1$d AP)</string>
+	<string name="dialog_monsterencounter_title">Combattimento</string>
+	<string name="dialog_monsterencounter_message">Vuoi attaccare? Difficoltà: %1$s</string>
+	<string name="dialog_monsterencounter_info">Info</string>
 
-        <string name="itemcategory_money">Denaro</string>
-        <string name="itemcategory_weapon">Arma</string>
-        <string name="itemcategory_shield">Scudo</string>
-        <string name="itemcategory_wearable_head">Indossabile (Testa)</string>
-        <string name="itemcategory_wearable_body">Indossabile (Corpo)</string>
-        <string name="itemcategory_wearable_hand">Indossabile (Mani)</string>
-        <string name="itemcategory_wearable_feet">Indossabile (Piedi)</string>
-        <string name="itemcategory_wearable_neck">Indossabile (Collo)</string>
-        <string name="itemcategory_wearable_ring">Indossabile (Anelli)</string>
-        <string name="itemcategory_potion">Pozione</string>
-        <string name="itemcategory_other">Altro</string>
-       
-        <string name="startscreen_continue">Continua la partita in corso</string>
-        <string name="startscreen_newgame">Nuovo</string>
-        <string name="startscreen_newgame_confirm">Perderai la partita attuale e il tuo personaggio corrente, sei sicuro di voler iniziare una nuova partita?</string>
-        <string name="startscreen_about">Info/Aiuto</string>
-        <string name="startscreen_enterheroname">Nome dell\'eroe</string>
-        <string name="startscreen_load">Carica</string>
-       
-        <string name="conversation_rewardexp"> [Hai guadagnato %1$d esperienza]</string>
-        <string name="conversation_rewardgold"> [Hai guadagnato %1$d oro]</string>
-        <string name="conversation_lostgold"> [Hai perso %1$d oro]</string>
-        <string name="conversation_rewarditem"> [Hai guadagnato un oggetto]</string>
-        <string name="conversation_rewarditems"> [Hai guadagnato %1$d oggetti]</string>
-		<string name="conversation_next">Avanti</string>
-	       
-        <string name="shop_buy">Compra</string>
-        <string name="shop_sell">Vendi</string>
-        <string name="shop_infoitem">Info</string>
-        <string name="shop_buyitem">Compra (%1$d oro)</string>
-        <string name="shop_sellitem">Vendi (%1$d oro)</string>
-        <string name="shop_yourgold">Tuo Oro: %1$d</string>
-        <string name="shop_item_bought">%1$s Comprato.</string>
-        <string name="shop_item_sold">%1$s Venduo.</string>
-       
-        <string name="levelup_title">Nuovo Livello</string>
-        <string name="levelup_description">Benvenuto nel livello %1$d!</string>
-        <string name="levelup_buttontext">Nuovo Livello</string>
-        <string name="levelup_add_health">Aumenta salute (+%1$d HP)</string>
-        <string name="levelup_add_health_description">Aggiungi %1$d alla salute massima</string>
-        <string name="levelup_add_attackchance">Aumenta possibilità attacco (+%1$d %%)</string>
-        <string name="levelup_add_attackchance_description">Aggiungi %1$d%% alla tua possibilità attacco</string>
-        <string name="levelup_add_attackdamage">Aumenta danni attacco (+%1$d)</string>
-        <string name="levelup_add_attackdamage_description">Aggiungi %1$d al tuo attacco base</string>
-        <string name="levelup_add_blockchance">Aumenta possibilità difesa (+%1$d %%)</string>
-        <string name="levelup_add_blockchance_description">Aggiungi %1$d%% alla tua possibilità difesa base</string>
-       
-        <string name="dialog_rest_title">Riposa</string>
-        <string name="dialog_rest_confirm_message">Vuoi riposare qui?</string>
-        <string name="dialog_rest_message">Hai riposato e la tua salute è tornata al massimo.</string>
+	<string name="status_hp">HP:</string>
+	<string name="status_mp">MP:</string>
+	<string name="status_ap">AP:</string>
+	<string name="status_exp">Livello:</string>
 
-        <string name="about_button1">Aiuto</string>
-        <string name="about_button2">Autori</string>
-        <string name="about_button3">Licenza</string>
-        <string name="about_contents1">
-                Benvenuto in Andor\'s Trail, un gioco RPG per Android.&lt;br /&gt;
-                &lt;br /&gt;
-                &lt;a href="http://andorstrail.com/"&gt;Forum del gioco su andorstrail.com per domande e discussioni riguardo il gameplay.&lt;/a&gt;&lt;br /&gt;
-				&lt;br /&gt;
-				&lt;a href="http://andorstrail.com/wiki"&gt;Game wiki for info about the Andor\'s Trail world, among other things.&lt;/a&gt;&lt;br /&gt;
-				&lt;br /&gt;
-				&lt;a href="http://code.google.com/p/andors-trail/"&gt;Homepage del progetto su code.google.com&lt;/a&gt;&lt;br /&gt;
-                &lt;br /&gt;
-                Visita il forum per le discussioni con gli altri giocatori.&lt;br /&gt;
-        </string>
-        <string name="about_contents3">
-                Questo programma è un software libero,ed è possibile ridistribuirlo e / o modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, nella versione 2 della licenza o (a scelta) una versione successiva.&lt;br /&gt;
-                &lt;br /&gt;
-                Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.&lt;br /&gt;
-                &lt;br /&gt;
-                Si dovrebbe aver ricevuto una copia della GNU General Public License insieme a questo programma, se no, vedere &lt;a href="http://www.gnu.org/licenses"&gt;http://www.gnu.org/licenses&lt;/a&gt;&lt;br /&gt;
-                &lt;br /&gt;
-                Per il codice sorgente e le richieste di funzionalità, visita la pagina del progetto su &lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
-        </string>
-       
-        <string name="dialog_newversion_title">Benvenuto</string>
-        <string name="dialog_newversion_message">
-                Grazie per aver scaricato Andor\'s Trail!\n\n
-                Si prega di notare che questa versione di Andor\'s Trail è un WORK IN PROGRESS, il che significa che tutte le mappe non sono ancora complete.\n
-                Siete comunque liberi di esplorare villaggio Crossglen quanto vi pare.\n
-                Poiché questo è un work in progress, può contenere bug e un gameplay non correttamente bilanciato. Il presente comunicato è da intendersi come una caccia al bug prima di iniziare ad aggiungere altri contenuti.\n
-                Si prega di visitare la pagina del progetto per ottenere maggiori informazioni o per contribuire al progetto (vedi "about").\n
-                \n
-                Grazie per tutti i Feedback!
-        </string>
-       
-        <string name="questlog_title">Missioni</string>
-        <string name="questlog_includecompleted_prompt">Seleziona le missioni da mostrare</string>
-        <string name="questlog_includecompleted_hidecompleted">Nascondi le missioni complete</string>
-        <string name="questlog_includecompleted_includecompleted">Includi le missioni complete</string>
-        <string name="questlog_includecompleted_onlycompleted">Solo missioni complete</string>
-        <string name="questlog_queststatus">Stato: %1$s</string>
-        <string name="questlog_queststatus_inprogress">In corso</string>
-        <string name="questlog_queststatus_completed">Completato</string>       
-        
-        <string name="preferences_display_category">Schermo</string>
-        <string name="preferences_display_fullscreen_title">Schermo intero</string>
-        <string name="preferences_display_fullscreen">Visualizza il gioco a schermo intero. (Richiede il riavvio del gioco)</string>
-        <string name="preferences_dialog_category">Conferme dialoghi</string>
-        <string name="preferences_dialog_confirmrest_title">Conferma riposo</string>
-        <string name="preferences_dialog_confirmrest">Chiedi una conferma prima di fermarsi a riposare in un letto. Altrimenti, appena vai su di un letto riposerai automaticamente.</string>
-        <string name="preferences_dialog_confirmattack_title">Conferma attacco</string>
-        <string name="preferences_dialog_confirmattack">Abilita la richiesta \'Vuoi attaccare?\' quando ti avvicini ad un nemico.</string>
-        <string name="preferences_dialog_monsterloot_title">Visualizza il bottino</string>
-        <string name="preferences_dialog_monsterloot">Scegli se mostrare il bottino conquistato dopo un combattimento (oro, esperienza, oggetti).</string>
-        <string name="preferences_combat_category">Combattimento</string>
-        <string name="preferences_combat_speed_title">Velocità di combattimento</string>
-        <string name="preferences_combat_speed">Determina quanto la velocità di combattimento dei nemici.</string>
+	<string name="heroinfo_char">Panoramica</string>
+	<string name="heroinfo_inv">Inventario</string>
+	<string name="heroinfo_wear">Equipaggiamento</string>
+	<string name="heroinfo_skill">Abilità</string>
+	<string name="heroinfo_spell">Incantesimi</string>
+	<string name="heroinfo_levelup">Nuovo Livello</string>
+	<string name="heroinfo_level">Livello</string>
+	<string name="heroinfo_totalexperience">Esperienza Totale</string>
+	<string name="heroinfo_wornequipment">Equipaggiamento indossato</string>
+	<string name="heroinfo_inventory">Inventario</string>
+	<string name="heroinfo_gold">Oro: %1$d</string>
+	<string name="heroinfo_actionpoints">Punti azione (AP):</string>
+	<string name="heroinfo_quests">Missioni</string>
 
-        <string name="preferences_display_loot_dialog">Mostra il resoconto del bottino</string>
-        <string name="preferences_display_loot_toast">Mostra notifica corta</string>
-        <string name="preferences_display_loot_never">Non mostrare</string>
-        <string name="preferences_attackspeed_instant">Istantanea (nessuna animazione)</string>
-        <string name="preferences_attackspeed_fast">Veloce</string>
-        <string name="preferences_attackspeed_normal">Normale</string>
-        <string name="preferences_attackspeed_slow">Lenta</string>
-        
-        <string name="preferences_movement_category">Movimento</string>
-        <string name="preferences_movementmethod_title">Tipo di movimento</string>
-        <string name="preferences_movementmethod">Tipo di movimento e manovre sugli ostacoli.</string>
-        <string name="preferences_movementmethods_straight">Diritto (originale)</string>
-        <string name="preferences_movementmethods_avoid">Direzionale</string>
+	<string name="combat_attack">Attacco (%1$d AP)</string>
+	<string name="combat_move">Movimento (%1$d AP)</string>
+	<string name="combat_use">Usare oggetti</string>
+	<string name="combat_spell">Incantesimo</string>
+	<string name="combat_endturn">Fine turno</string>
+	<!-- <string name="combat_endcombat">End combat</string>-->
+	<string name="combat_flee">Fuggi</string>
+	<string name="combat_begin_flee">Ora puoi fuggire dal combattimento cliccando nella direzione in cui vuoi fuggire.</string>
+	<string name="combat_flee_failed">La tua fuga è fallita!</string>
+	<string name="combat_status_ap">AP: %1$d</string>
+	<string name="combat_monsterhealth">HP:</string>
+	<string name="combat_monsteraction">%1$s sta attaccando.</string>
+	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by longclicking a place with no adjacent monster, before you may end the combat.</string> -->
+	<string name="combat_result_monstermiss">%1$s manca il colpo!</string>
+	<string name="combat_result_monsterhit">%1$s colpisce per %2$d hp!</string>
+	<string name="combat_result_monsterhitcritical">%1$s effettua un colpo critico per %2$d hp!</string>
+	<string name="combat_result_heromiss">Il tuo attacco è fallito.</string>
+	<string name="combat_result_herohit">Hai colpito %1$s per %2$d hp!</string>
+	<string name="combat_result_herohitcritical">Sferri un colpo critico %1$s per %2$d hp!</string>
+	<string name="combat_result_herokillsmonster">%1$s muore!</string>
+	<string name="combat_not_enough_ap">Non hai abbastanza AP attendi il prossimo turno.</string>
+	<string name="combat_hero_dies">Cadi svenuto ma fortunatamente ti risvegli vivo. Hai perso %1$d esperienza.</string>
+
+	<string name="inventory_info">Info</string>
+	<string name="inventory_equip">Oggetti in uso</string>
+	<string name="inventory_unequip">Oggetti non usati</string>
+	<string name="inventory_use">Usa</string>
+	<string name="inventory_drop">Scarica</string>
+	<string name="inventory_item_used">Hai usato %1$s.</string>
+	<string name="inventory_item_dropped">%1$s è stato abbandonato.</string>
+	<string name="inventory_item_equipped">Stai usando %1$s.</string>
+
+	<string name="dialog_loot_pickall">Raccogli tutto</string>
+	<string name="dialog_loot_foundgold">Hai %1$d Oro. </string>
+	<string name="dialog_loot_pickedupitems">Hai raccolto %1$d oggetti.</string>
+	<string name="dialog_groundloot_title">Oggetti</string>
+	<string name="dialog_groundloot_message">Hai trovato alcuni oggetti. </string>
+	<string name="dialog_monsterloot_title">Vittoria</string>
+	<string name="dialog_monsterloot_message">Sei sopravvissuto all\'incontro.</string>
+	<string name="dialog_monsterloot_gainedexp">Hai aumentato %1$d di esperienza.</string>
+
+	<string name="monster_difficulty_veryeasy">Facilissimo</string>
+	<string name="monster_difficulty_easy">Facile</string>
+	<string name="monster_difficulty_normal">Normale</string>
+	<string name="monster_difficulty_hard">Difficile</string>
+	<string name="monster_difficulty_veryhard">Difficilissimo</string>
+	<string name="monster_difficulty_impossible">Impossibile</string>
+
+	<string name="actorinfo_class">Classe:</string>
+	<string name="actorinfo_difficulty">Difficoltà:</string>
+	<string name="actorinfo_health">Salute:</string>
+	<string name="actorinfo_attacksperturn">Attacchi/turno:</string>
+	<string name="actorinfo_movesperturn">Movementi/turno:</string>
+	<string name="actorinfo_attack">Attacco:</string>
+	<string name="actorinfo_criticalhit">Colpo critico:</string>
+	<string name="actorinfo_defense">Difesa:</string>
+	<string name="actorinfo_movecost">Costo mossa (AP):</string>
+	<string name="actorinfo_basetraits">Statistiche oggetti non indossati (base)</string>
+	<string name="actorinfo_currenttraits">Statistiche oggetti indossati (correnti)</string>
+
+	<string name="traitsinfo_attack_cost">Costo attacco (AP):</string>
+	<string name="traitsinfo_attack_chance">Possibilità attacco:</string>
+	<string name="traitsinfo_attack_damage">Possibilità danni:</string>
+	<string name="traitsinfo_criticalhit_skill">colpo critico:</string>
+	<string name="traitsinfo_criticalhit_multiplier">moltiplicatore critico:</string>
+	<string name="traitsinfo_defense_chance">Possibilità difesa:</string>
+	<string name="traitsinfo_defense_damageresist">Resistenza ai danni:</string>
+
+	<!-- <string name="key_required">E\' richiesta una chiave specifica per passare.</string> -->
+
+	<string name="iteminfo_category">Categoria: </string>
+	<string name="iteminfo_action_use">Usa</string>
+	<string name="iteminfo_action_equip">Indossa</string>
+	<string name="iteminfo_action_unequip">Togli</string>
+	<string name="iteminfo_action_use_ap">Usa (%1$d AP)</string>
+	<string name="iteminfo_action_equip_ap">Indossa (%1$d AP)</string>
+	<string name="iteminfo_action_unequip_ap">Togli (%1$d AP)</string>
+
+	<string name="itemcategory_money">Denaro</string>
+	<string name="itemcategory_weapon">Arma</string>
+	<string name="itemcategory_shield">Scudo</string>
+	<string name="itemcategory_wearable_head">Indossabile (Testa)</string>
+	<string name="itemcategory_wearable_body">Indossabile (Corpo)</string>
+	<string name="itemcategory_wearable_hand">Indossabile (Mani)</string>
+	<string name="itemcategory_wearable_feet">Indossabile (Piedi)</string>
+	<string name="itemcategory_wearable_neck">Indossabile (Collo)</string>
+	<string name="itemcategory_wearable_ring">Indossabile (Anelli)</string>
+	<string name="itemcategory_potion">Pozione</string>
+	<string name="itemcategory_other">Altro</string>
+
+	<string name="startscreen_continue">Continua la partita in corso</string>
+	<string name="startscreen_newgame">Nuovo</string>
+	<string name="startscreen_newgame_confirm">Perderai la partita attuale e il tuo personaggio corrente, sei sicuro di voler iniziare una nuova partita?</string>
+	<string name="startscreen_about">Info/Aiuto</string>
+	<string name="startscreen_enterheroname">Nome dell\'eroe</string>
+	<string name="startscreen_load">Carica</string>
+
+	<string name="conversation_rewardexp"> [Hai guadagnato %1$d esperienza]</string>
+	<string name="conversation_rewardgold"> [Hai guadagnato %1$d oro]</string>
+	<string name="conversation_lostgold"> [Hai perso %1$d oro]</string>
+	<string name="conversation_rewarditem"> [Hai guadagnato un oggetto]</string>
+	<string name="conversation_rewarditems"> [Hai guadagnato %1$d oggetti]</string>
+	<string name="conversation_next">Avanti</string>
+
+	<string name="shop_buy">Compra</string>
+	<string name="shop_sell">Vendi</string>
+	<string name="shop_infoitem">Info</string>
+	<string name="shop_buyitem">Compra (%1$d oro)</string>
+	<string name="shop_sellitem">Vendi (%1$d oro)</string>
+	<string name="shop_yourgold">Tuo Oro: %1$d</string>
+	<string name="shop_item_bought">%1$s Comprato.</string>
+	<string name="shop_item_sold">%1$s Venduo.</string>
+
+	<string name="levelup_title">Nuovo Livello</string>
+	<string name="levelup_description">Benvenuto nel livello %1$d!</string>
+	<string name="levelup_buttontext">Nuovo Livello</string>
+	<string name="levelup_add_health">Aumenta salute (+%1$d HP)</string>
+	<string name="levelup_add_health_description">Aggiungi %1$d alla salute massima</string>
+	<string name="levelup_add_attackchance">Aumenta possibilità attacco (+%1$d %%)</string>
+	<string name="levelup_add_attackchance_description">Aggiungi %1$d%% alla tua possibilità attacco</string>
+	<string name="levelup_add_attackdamage">Aumenta danni attacco (+%1$d)</string>
+	<string name="levelup_add_attackdamage_description">Aggiungi %1$d al tuo attacco base</string>
+	<string name="levelup_add_blockchance">Aumenta possibilità difesa (+%1$d %%)</string>
+	<string name="levelup_add_blockchance_description">Aggiungi %1$d%% alla tua possibilità difesa base</string>
+
+	<string name="dialog_rest_title">Riposa</string>
+	<string name="dialog_rest_confirm_message">Vuoi riposare qui?</string>
+	<string name="dialog_rest_message">Hai riposato e la tua salute è tornata al massimo.</string>
+
+	<string name="about_button1">Aiuto</string>
+	<string name="about_button2">Autori</string>
+	<string name="about_button3">Licenza</string>
+	<string name="about_contents1">
+			Benvenuto in Andor\'s Trail, un gioco RPG per Android.&lt;br /&gt;
+			&lt;br /&gt;
+			&lt;a href="http://andorstrail.com/"&gt;Forum del gioco su andorstrail.com per domande e discussioni riguardo il gameplay.&lt;/a&gt;&lt;br /&gt;
+			&lt;br /&gt;
+			&lt;a href="http://andorstrail.com/wiki"&gt;Game wiki for info about the Andor\'s Trail world, among other things.&lt;/a&gt;&lt;br /&gt;
+			&lt;br /&gt;
+			&lt;a href="http://code.google.com/p/andors-trail/"&gt;Homepage del progetto su code.google.com&lt;/a&gt;&lt;br /&gt;
+			&lt;br /&gt;
+			Visita il forum per le discussioni con gli altri giocatori.&lt;br /&gt;
+	</string>
+	<string name="about_contents3">
+			Questo programma è un software libero,ed è possibile ridistribuirlo e / o modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, nella versione 2 della licenza o (a scelta) una versione successiva.&lt;br /&gt;
+			&lt;br /&gt;
+			Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.&lt;br /&gt;
+			&lt;br /&gt;
+			Si dovrebbe aver ricevuto una copia della GNU General Public License insieme a questo programma, se no, vedere &lt;a href="http://www.gnu.org/licenses"&gt;http://www.gnu.org/licenses&lt;/a&gt;&lt;br /&gt;
+			&lt;br /&gt;
+			Per il codice sorgente e le richieste di funzionalità, visita la pagina del progetto su &lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
+	</string>
+
+	<string name="dialog_newversion_title">Benvenuto</string>
+	<string name="dialog_newversion_message">
+			Grazie per aver scaricato Andor\'s Trail!\n\n
+			Si prega di notare che questa versione di Andor\'s Trail è un WORK IN PROGRESS, il che significa che tutte le mappe non sono ancora complete.\n
+			Siete comunque liberi di esplorare villaggio Crossglen quanto vi pare.\n
+			Poiché questo è un work in progress, può contenere bug e un gameplay non correttamente bilanciato. Il presente comunicato è da intendersi come una caccia al bug prima di iniziare ad aggiungere altri contenuti.\n
+			Si prega di visitare la pagina del progetto per ottenere maggiori informazioni o per contribuire al progetto (vedi "about").\n
+			\n
+			Grazie per tutti i Feedback!
+	</string>
+
+	<string name="questlog_title">Missioni</string>
+	<string name="questlog_includecompleted_prompt">Seleziona le missioni da mostrare</string>
+	<string name="questlog_includecompleted_hidecompleted">Nascondi le missioni complete</string>
+	<string name="questlog_includecompleted_includecompleted">Includi le missioni complete</string>
+	<string name="questlog_includecompleted_onlycompleted">Solo missioni complete</string>
+	<string name="questlog_queststatus">Stato: %1$s</string>
+	<string name="questlog_queststatus_inprogress">In corso</string>
+	<string name="questlog_queststatus_completed">Completato</string>
+
+	<string name="preferences_display_category">Schermo</string>
+	<string name="preferences_display_fullscreen_title">Schermo intero</string>
+	<string name="preferences_display_fullscreen">Visualizza il gioco a schermo intero. (Richiede il riavvio del gioco)</string>
+	<string name="preferences_dialog_category">Conferme dialoghi</string>
+	<string name="preferences_dialog_confirmrest_title">Conferma riposo</string>
+	<string name="preferences_dialog_confirmrest">Chiedi una conferma prima di fermarsi a riposare in un letto. Altrimenti, appena vai su di un letto riposerai automaticamente.</string>
+	<string name="preferences_dialog_confirmattack_title">Conferma attacco</string>
+	<string name="preferences_dialog_confirmattack">Abilita la richiesta \'Vuoi attaccare?\' quando ti avvicini ad un nemico.</string>
+	<string name="preferences_dialog_monsterloot_title">Visualizza il bottino</string>
+	<string name="preferences_dialog_monsterloot">Scegli se mostrare il bottino conquistato dopo un combattimento (oro, esperienza, oggetti).</string>
+	<string name="preferences_combat_category">Combattimento</string>
+	<string name="preferences_combat_speed_title">Velocità di combattimento</string>
+	<string name="preferences_combat_speed">Determina quanto la velocità di combattimento dei nemici.</string>
+
+	<string name="preferences_display_loot_dialog">Mostra il resoconto del bottino</string>
+	<string name="preferences_display_loot_toast">Mostra notifica corta</string>
+	<string name="preferences_display_loot_never">Non mostrare</string>
+	<string name="preferences_attackspeed_instant">Istantanea (nessuna animazione)</string>
+	<string name="preferences_attackspeed_fast">Veloce</string>
+	<string name="preferences_attackspeed_normal">Normale</string>
+	<string name="preferences_attackspeed_slow">Lenta</string>
+
+	<string name="preferences_movement_category">Movimento</string>
+	<string name="preferences_movementmethod_title">Tipo di movimento</string>
+	<string name="preferences_movementmethod">Tipo di movimento e manovre sugli ostacoli.</string>
+	<string name="preferences_movementmethods_straight">Diritto (originale)</string>
+	<string name="preferences_movementmethods_avoid">Direzionale</string>
 
 
-        <!-- =========================================== -->
-        <!-- Added in v0.6.9 -->
+	<!-- =========================================== -->
+	<!-- Added in v0.6.9 -->
 
-        <string name="actorinfo_currentconditions">Condizioni attive</string> <!-- Translated as: affliction / statuseffect / temporary effect -->
-        <string name="actorcondition_info_removes_all">Rimuovi tutte %1$s</string>
-        <string name="iteminfo_effect_chance_of">%1$s cambio di %2$s</string>
-        <string name="iteminfo_effect_duration">(%1$d turni)</string>
+	<string name="actorinfo_currentconditions">Condizioni attive</string> <!-- Translated as: affliction / statuseffect / temporary effect -->
+	<string name="actorcondition_info_removes_all">Rimuovi tutte %1$s</string>
+	<string name="iteminfo_effect_chance_of">%1$s cambio di %2$s</string>
+	<string name="iteminfo_effect_duration">(%1$d turni)</string>
+
+	<string name="iteminfo_effect_works_on_source">Sulla sorgente</string>
+	<string name="iteminfo_effect_works_on_target">Sul bersaglio</string>
+	<string name="iteminfo_effect_works_when_hitting_target">Quando colpisci il bersaglio</string>
+	<string name="iteminfo_effect_works_when_killing_target">Ogni uccisione</string>
+	<string name="iteminfo_effect_works_when_used">Quando usata</string>
+	<string name="iteminfo_effect_works_when_equipped">Quando equipaggiata</string>
+
+	<string name="iteminfo_effect_decrease_current_hp">Prosciuga %1$s HP</string>
+	<string name="iteminfo_effect_increase_current_hp">Ripristina %1$s HP</string>
+	<string name="iteminfo_effect_decrease_current_ap">Prosciuga %1$s AP</string>
+	<string name="iteminfo_effect_increase_current_ap">Ripristina %1$s AP</string>
+
+	<string name="iteminfo_effect_increase_max_hp">Aumenta gli HP max +%1$d</string>
+	<string name="iteminfo_effect_decrease_max_hp">Diminuisce gli HP max di %1$d</string>
+	<string name="iteminfo_effect_increase_max_ap">Aumenta gli AP max +%1$d</string>
+	<string name="iteminfo_effect_decrease_max_ap">Aumenta gli AP max %1$d</string>
+	<string name="iteminfo_effect_increase_movecost">Il movimento è penalizzato di +%1$d AP</string>
+	<string name="iteminfo_effect_decrease_movecost">Il movimento è migliorato di %1$d AP</string>
+
+	<string name="preferences_display_scaling_factor_title">Fattore di scala</string>
+	<string name="preferences_display_scaling_factor">Tutto il gioco viene visualizzato più grande.</string>
+	<string name="preferences_display_scaling_factor_normal">Normale</string>
+	<string name="preferences_display_scaling_factor_50_percent_larger">1.5x normale</string>
+	<string name="preferences_display_scaling_factor_double">Raddoppia</string>
 
-        <string name="iteminfo_effect_works_on_source">Sulla sorgente</string>
-        <string name="iteminfo_effect_works_on_target">Sul bersaglio</string>
-        <string name="iteminfo_effect_works_when_hitting_target">Quando colpisci il bersaglio</string>
-        <string name="iteminfo_effect_works_when_killing_target">Ogni uccisione</string>
-        <string name="iteminfo_effect_works_when_used">Quando usata</string>
-        <string name="iteminfo_effect_works_when_equipped">Quando equipaggiata</string>
-        
-        <string name="iteminfo_effect_decrease_current_hp">Prosciuga %1$s HP</string>
-        <string name="iteminfo_effect_increase_current_hp">Ripristina %1$s HP</string>
-        <string name="iteminfo_effect_decrease_current_ap">Prosciuga %1$s AP</string>
-        <string name="iteminfo_effect_increase_current_ap">Ripristina %1$s AP</string>
-        
-        <string name="iteminfo_effect_increase_max_hp">Aumenta gli HP max +%1$d</string>
-        <string name="iteminfo_effect_decrease_max_hp">Diminuisce gli HP max di %1$d</string>
-        <string name="iteminfo_effect_increase_max_ap">Aumenta gli AP max +%1$d</string>
-        <string name="iteminfo_effect_decrease_max_ap">Aumenta gli AP max %1$d</string>
-        <string name="iteminfo_effect_increase_movecost">Il movimento è penalizzato di +%1$d AP</string>
-        <string name="iteminfo_effect_decrease_movecost">Il movimento è migliorato di %1$d AP</string>
-        
-        <string name="preferences_display_scaling_factor_title">Fattore di scala</string>
-        <string name="preferences_display_scaling_factor">Tutto il gioco viene visualizzato più grande.</string>
-        <string name="preferences_display_scaling_factor_normal">Normale</string>
-        <string name="preferences_display_scaling_factor_50_percent_larger">1.5x normale</string>
-        <string name="preferences_display_scaling_factor_double">Raddoppia</string>
-        
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
-	
+
 	<string name="localize_resources_from_mo_filename">it.mo</string>
 
 </resources>
diff --git a/AndorsTrail/res/values-iw/strings.xml b/AndorsTrail/res/values-iw/strings.xml
index a201c74b1..105d9d783 100644
--- a/AndorsTrail/res/values-iw/strings.xml
+++ b/AndorsTrail/res/values-iw/strings.xml
@@ -15,17 +15,17 @@
 	<string name="loadsave_selectslot">בחר תא</string>
 	<string name="loadsave_slot_empty">(פנוי)</string>
 	<string name="savegame_currenthero_displayinfo">דרגה %1$d, %2$d נסיון, %3$d זהב</string>
-	
+
 	<string name="dialog_loading_message">טוען משאבם...</string>
 	<string name="dialog_loading_failed_title">נכשל בטעינה</string>
 	<string name="dialog_loading_failed_message">המשחק לא הצליח לטעון שמירה.\n\n:(\n\nהקובץ עשוי להיות פגום או לא שלם.</string>
 	<string name="dialog_loading_failed_incorrectversion">המשחק לא הצליח לטעון שמירה. השמירה נעשתה בגרסא חדשה יותר של המשחק מזו שרצה.</string>
-	
+
 	<string name="dialog_close">סגור</string>
-	
+
 	<string name="dialog_confirmexit_title">יציאה</string>
 	<string name="dialog_confirmexit_message">בטוח שברצונך לצאת?</string>
-	
+
 	<string name="dialog_paused_title">עצור</string>
 	<string name="dialog_paused_message">המשחק נעצר</string>
 	<string name="dialog_paused_resume">המשך</string>
@@ -46,13 +46,13 @@
 	<string name="heroinfo_spell">קסמים</string>
 	<string name="heroinfo_levelup">עלייה בדרגה</string>
 	<string name="heroinfo_level">דרגה</string>
-	<string name="heroinfo_totalexperience">נסיון כולל</string>	
+	<string name="heroinfo_totalexperience">נסיון כולל</string>
 	<string name="heroinfo_wornequipment">Worn equipment</string>
 	<string name="heroinfo_inventory">ציוד</string>
 	<string name="heroinfo_gold">זהב: %1$d</string>
 	<string name="heroinfo_actionpoints">נקודות פעילות (פעילות):</string>
 	<string name="heroinfo_quests">Quests</string>
-	
+
 	<string name="combat_attack">תקיפה (%1$d פעילות)</string>
 	<string name="combat_move">תנועה (%1$d פעילות)</string>
 	<string name="combat_use">השתמש בחפץ</string>
@@ -73,7 +73,7 @@
 	<string name="combat_result_herokillsmonster">%1$s מת!</string>
 	<string name="combat_not_enough_ap">לא מספיק נקודות פעילות בסיבוב זה.</string>
 	<string name="combat_hero_dies">אתה מאבד את ההכרה ובמזל מתעורר בחיים. הפסדת %1$d נסיון.</string>
-		
+
 	<string name="inventory_info">מידע</string>
 	<string name="inventory_equip">צייד</string>
 	<string name="inventory_unequip">הסר ציוד</string>
@@ -91,22 +91,22 @@
 	<string name="dialog_monsterloot_title">ניצחון</string>
 	<string name="dialog_monsterloot_message">שרדת את המפגש. </string>
 	<string name="dialog_monsterloot_gainedexp">צברת %1$d נסיון. </string>
-    
-    <string name="monster_difficulty_veryeasy">קל מאוד</string>
-    <string name="monster_difficulty_easy">קל</string>
-    <string name="monster_difficulty_normal">רגיל</string>
-    <string name="monster_difficulty_hard">קשה</string>
-    <string name="monster_difficulty_veryhard">קשה מאוד</string>
-    <string name="monster_difficulty_impossible">בלתי אפשרי</string>
 
-    <string name="actorinfo_class">סוג:</string>
-    <string name="actorinfo_difficulty">קושי:</string>
-    <string name="actorinfo_health">בריאות:</string>
-    <string name="actorinfo_attacksperturn">תקיפות/סיבוב:</string>
-    <string name="actorinfo_movesperturn">תנועה/סיבוב:</string>
-    <string name="actorinfo_attack">תקיפה:</string>
-    <string name="actorinfo_criticalhit">תקיפה קריטית:</string>
-    <string name="actorinfo_defense">הגנה:</string>
-    <string name="actorinfo_movecost">עלות תנועה (פעילות):</string>
+	<string name="monster_difficulty_veryeasy">קל מאוד</string>
+	<string name="monster_difficulty_easy">קל</string>
+	<string name="monster_difficulty_normal">רגיל</string>
+	<string name="monster_difficulty_hard">קשה</string>
+	<string name="monster_difficulty_veryhard">קשה מאוד</string>
+	<string name="monster_difficulty_impossible">בלתי אפשרי</string>
+
+	<string name="actorinfo_class">סוג:</string>
+	<string name="actorinfo_difficulty">קושי:</string>
+	<string name="actorinfo_health">בריאות:</string>
+	<string name="actorinfo_attacksperturn">תקיפות/סיבוב:</string>
+	<string name="actorinfo_movesperturn">תנועה/סיבוב:</string>
+	<string name="actorinfo_attack">תקיפה:</string>
+	<string name="actorinfo_criticalhit">תקיפה קריטית:</string>
+	<string name="actorinfo_defense">הגנה:</string>
+	<string name="actorinfo_movecost">עלות תנועה (פעילות):</string>
 
 </resources>
diff --git a/AndorsTrail/res/values-ja/strings.xml b/AndorsTrail/res/values-ja/strings.xml
index d0c514ba7..1fd6c7549 100644
--- a/AndorsTrail/res/values-ja/strings.xml
+++ b/AndorsTrail/res/values-ja/strings.xml
@@ -3,7 +3,7 @@
 <resources>
 	<string name="app_name">Andor\'s Trail</string>
 	<string name="app_description">Quest-driven fantasy RPG</string>
-	
+
 	<string name="exit">終了</string>
 	<string name="exit_to_menu">メニューに戻る</string>
 	<string name="menu_pause">ポーズ</string>
@@ -18,17 +18,17 @@
 	<string name="loadsave_selectslot">Select slot</string>
 	<string name="loadsave_slot_empty">(empty)</string>
 	<string name="savegame_currenthero_displayinfo">level %1$d, %2$d exp, %3$d gold</string>
-	
+
 	<string name="dialog_loading_message">Loading resources...</string>
 	<string name="dialog_loading_failed_title">読み込みに失敗しました</string>
 	<string name="dialog_loading_failed_message">Andor\'s Trail はセーブ・ファイルを読み込めませんでした.\n\n:(\n\nこのファイルは壊れているか不完全です\n\n)</string>
 	<string name="dialog_loading_failed_incorrectversion">Andor\'s Trail はセーブ・ファイルを読み込めませんでした. このファイルは現在実行中のバージョンより新しいバージョンのセーブ・ファイルです.</string>
-	
+
 	<string name="dialog_close">閉じる</string>
-	
+
 	<string name="dialog_confirmexit_title">終了</string>
 	<string name="dialog_confirmexit_message">本当に終了してもよろしいですか?</string>
-	
+
 	<string name="dialog_paused_title">Paused</string>
 	<string name="dialog_paused_message">一時停止中</string>
 	<string name="dialog_paused_resume">再開</string>
@@ -49,13 +49,13 @@
 	<string name="heroinfo_spell">呪文</string>
 	<string name="heroinfo_levelup">Level up</string>
 	<string name="heroinfo_level">Level</string>
-	<string name="heroinfo_totalexperience">総経験値(exp)</string>	
+	<string name="heroinfo_totalexperience">総経験値(exp)</string>
 	<string name="heroinfo_wornequipment">装備</string>
 	<string name="heroinfo_inventory">アイテム</string>
 	<string name="heroinfo_gold">Gold: %1$d</string>
 	<string name="heroinfo_actionpoints">行動値 (AP):</string>
 	<string name="heroinfo_quests">クエスト</string>
-	
+
 	<string name="combat_attack">攻撃 (%1$d AP)</string>
 	<string name="combat_move">移動 (%1$d AP)</string>
 	<string name="combat_use">アイテム使用</string>
@@ -68,7 +68,7 @@
 	<string name="combat_status_ap">AP: %1$d</string>
 	<string name="combat_monsterhealth">HP:</string>
 	<string name="combat_monsteraction">%1$s の攻撃</string>
-	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string>  -->
+	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string> -->
 	<string name="combat_result_monstermiss">%1$s は攻撃を外した。</string>
 	<string name="combat_result_monsterhit">%1$s はあなたを攻撃し %2$d のダメージを与えた。</string>
 	<string name="combat_result_monsterhitcritical">%1$s のクリティカルヒット! %2$d のダメージ!</string>
@@ -78,7 +78,7 @@
 	<string name="combat_result_herokillsmonster">%1$s は死んだ。</string>
 	<string name="combat_not_enough_ap">APが不足しています。</string>
 	<string name="combat_hero_dies">あなたは倒れたが、幸運にも生きていた。あなたは %1$d の経験値を失った。</string>
-	
+
 	<string name="inventory_info">情報</string>
 	<string name="inventory_equip">装備</string>
 	<string name="inventory_unequip">はずす</string>
@@ -97,35 +97,35 @@
 	<string name="dialog_monsterloot_title">勝利</string>
 	<string name="dialog_monsterloot_message">あなたは戦闘に勝った。\n</string>
 	<string name="dialog_monsterloot_gainedexp">あなたは %1$d の経験値を得た。\n</string>
-    
-    <string name="monster_difficulty_veryeasy">とても弱そう</string>
-    <string name="monster_difficulty_easy">弱そう</string>
-    <string name="monster_difficulty_normal">互角に見える</string>
-    <string name="monster_difficulty_hard">強そう</string>
-    <string name="monster_difficulty_veryhard">非常に強そう</string>
-    <string name="monster_difficulty_impossible">勝利は不可能に思える</string>
 
-    <string name="actorinfo_class">Class:</string>
-    <string name="actorinfo_difficulty">難易度:</string>
-    <string name="actorinfo_health">体力:</string>
-    <string name="actorinfo_attacksperturn">攻撃回数/ターン:</string>
-    <string name="actorinfo_movesperturn">移動回数/ターン:</string>
-    <string name="actorinfo_attack">攻撃力:</string>
-    <string name="actorinfo_criticalhit">クリティカルヒット:</string>
-    <string name="actorinfo_defense">防御力:</string>
-    <string name="actorinfo_movecost">移動コスト(AP):</string>
-    <string name="actorinfo_basetraits">基礎戦闘能力 (装備とスキルを除く)</string>
-    <string name="actorinfo_currenttraits">戦闘能力 (現在)</string>
-    
-    <string name="traitsinfo_attack_cost">攻撃コスト(AP):</string>
-    <string name="traitsinfo_attack_chance">命中:</string>
-    <string name="traitsinfo_attack_damage">ダメージ:</string>
-    <string name="traitsinfo_criticalhit_skill">クリティカルスキル:</string>
-    <string name="traitsinfo_criticalhit_multiplier">クリティカル倍率:</string>
-    <string name="traitsinfo_defense_chance">回避率:</string>
-    <string name="traitsinfo_defense_damageresist">ダメージ軽減:</string>
-    
-	<!-- <string name="key_required">A specific key is required to pass.</string>  -->
+	<string name="monster_difficulty_veryeasy">とても弱そう</string>
+	<string name="monster_difficulty_easy">弱そう</string>
+	<string name="monster_difficulty_normal">互角に見える</string>
+	<string name="monster_difficulty_hard">強そう</string>
+	<string name="monster_difficulty_veryhard">非常に強そう</string>
+	<string name="monster_difficulty_impossible">勝利は不可能に思える</string>
+
+	<string name="actorinfo_class">Class:</string>
+	<string name="actorinfo_difficulty">難易度:</string>
+	<string name="actorinfo_health">体力:</string>
+	<string name="actorinfo_attacksperturn">攻撃回数/ターン:</string>
+	<string name="actorinfo_movesperturn">移動回数/ターン:</string>
+	<string name="actorinfo_attack">攻撃力:</string>
+	<string name="actorinfo_criticalhit">クリティカルヒット:</string>
+	<string name="actorinfo_defense">防御力:</string>
+	<string name="actorinfo_movecost">移動コスト(AP):</string>
+	<string name="actorinfo_basetraits">基礎戦闘能力 (装備とスキルを除く)</string>
+	<string name="actorinfo_currenttraits">戦闘能力 (現在)</string>
+
+	<string name="traitsinfo_attack_cost">攻撃コスト(AP):</string>
+	<string name="traitsinfo_attack_chance">命中:</string>
+	<string name="traitsinfo_attack_damage">ダメージ:</string>
+	<string name="traitsinfo_criticalhit_skill">クリティカルスキル:</string>
+	<string name="traitsinfo_criticalhit_multiplier">クリティカル倍率:</string>
+	<string name="traitsinfo_defense_chance">回避率:</string>
+	<string name="traitsinfo_defense_damageresist">ダメージ軽減:</string>
+
+	<!-- <string name="key_required">A specific key is required to pass.</string> -->
 
 	<string name="iteminfo_category">カテゴリ: </string>
 	<string name="iteminfo_action_use">使う</string>
@@ -146,15 +146,15 @@
 	<string name="itemcategory_wearable_ring">防具 (指輪)</string>
 	<string name="itemcategory_potion">ポーション</string>
 	<string name="itemcategory_other">その他</string>
-	
+
 	<string name="startscreen_continue">ゲームを再開する</string>
 	<string name="startscreen_newgame">New game</string>
 	<string name="startscreen_newgame_confirm">セーブしていないゲームとキャラクターは消去されます。本当に新しいゲームを開始してよいですか?</string>
 	<string name="startscreen_about">About/help</string>
 	<string name="startscreen_enterheroname">主人公の名前を入力してください</string>
 	<string name="startscreen_load">Load</string>
-	
-	<!-- <string name="conversation_title">%1$s says</string>  -->
+
+	<!-- <string name="conversation_title">%1$s says</string> -->
 	<string name="conversation_rewardexp"> [%1$d の経験値を得た]</string>
 	<string name="conversation_rewardgold"> [%1$d gold を得た]</string>
 	<string name="conversation_lostgold"> [%1$d gold を失った]</string>
@@ -162,7 +162,7 @@
 	<string name="conversation_rewarditems"> [%1$d 個のアイテムを手に入れた]</string>
 	<string name="conversation_next">次へ</string>
 	<string name="conversation_leave">立ち去る</string>
-	
+
 	<string name="shop_buy">買う</string>
 	<string name="shop_sell">売る</string>
 	<string name="shop_infoitem">情報</string>
@@ -171,7 +171,7 @@
 	<string name="shop_yourgold">所持金: %1$d gold</string>
 	<string name="shop_item_bought">%1$s を買った。</string>
 	<string name="shop_item_sold">%1$s を売った。</string>
-	
+
 	<string name="levelup_title">Level up</string>
 	<string name="levelup_description">Level %1$d に到達しました!</string>
 	<string name="levelup_buttontext">Level up</string>
@@ -183,7 +183,7 @@
 	<string name="levelup_add_attackdamage_description">基礎ダメージが %1$d だけ上昇します。</string>
 	<string name="levelup_add_blockchance">回避率の向上 (+%1$d%%)</string>
 	<string name="levelup_add_blockchance_description">基礎回避率が %1$d%% だけ上昇します。</string>
-	
+
 	<string name="dialog_rest_title">休憩</string>
 	<string name="dialog_rest_confirm_message">ここで休みますか?</string>
 	<string name="dialog_rest_message">あなたの体力は完全に回復した。</string>
@@ -203,10 +203,10 @@
 		&lt;br /&gt;
 	</string>
 
-	<!-- 
-		This is the GNU GPL v2 text, originally from 
+	<!--
+		This is the GNU GPL v2 text, originally from
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-		For translation of this text, you might be able to find a version in your language here: 
+		For translation of this text, you might be able to find a version in your language here:
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
 	-->
 	<string name="about_contents3">
@@ -218,7 +218,7 @@
 		&lt;br /&gt;
 		For source code and feature requests, please visit the project page at &lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
 	</string>
-	
+
 	<string name="dialog_newversion_title">Welcome</string>
 	<string name="dialog_newversion_message">
 		Andor\'s Trailをダウンロードして下さりありがとうございます!\n\n
@@ -232,8 +232,8 @@
 		Please visit the project forums to discuss the game with other players or to help make the game even better (see "about").\n
 		\n
 		Thanks for all the feedback!
-	</string> 
-	
+	</string>
+
 	<string name="questlog_title">クエスト</string>
 	<string name="questlog_includecompleted_prompt">表示するクエスト:</string>
 	<string name="questlog_includecompleted_hidecompleted">完了したクエスト以外</string>
@@ -242,7 +242,7 @@
 	<string name="questlog_queststatus">状況: %1$s</string>
 	<string name="questlog_queststatus_inprogress">進行中</string>
 	<string name="questlog_queststatus_completed">完了</string>
-	
+
 	<string name="preferences_display_category">表示</string>
 	<string name="preferences_display_fullscreen_title">フルスクリーン</string>
 	<string name="preferences_display_fullscreen">ゲームをフルスクリーンで表示(再起動が必要)</string>
@@ -264,7 +264,7 @@
 	<string name="preferences_attackspeed_fast">速い</string>
 	<string name="preferences_attackspeed_normal">普通</string>
 	<string name="preferences_attackspeed_slow">遅い</string>
-	
+
 	<string name="preferences_movement_category">移動</string>
 	<string name="preferences_movementmethod_title">移動方法</string>
 	<string name="preferences_movementmethod">移動と障害物の扱い</string>
@@ -286,39 +286,39 @@
 	<string name="iteminfo_effect_works_when_killing_target">モンスターを殺したとき</string>
 	<string name="iteminfo_effect_works_when_used">使用したとき</string>
 	<string name="iteminfo_effect_works_when_equipped">装備したとき</string>
-	
+
 	<string name="iteminfo_effect_decrease_current_hp">%1$s HPを失う</string>
 	<string name="iteminfo_effect_increase_current_hp">%1$s HPを回復する</string>
 	<string name="iteminfo_effect_decrease_current_ap">%1$s APを失う</string>
 	<string name="iteminfo_effect_increase_current_ap">%1$s APを回復する</string>
-	
+
 	<string name="iteminfo_effect_increase_max_hp">最大HP増加 +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_hp">最大HP減少 -%1$d</string>
 	<string name="iteminfo_effect_increase_max_ap">最大AP増加 +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_ap">最大AP減少 -%1$d</string>
 	<string name="iteminfo_effect_increase_movecost">移動コスト増加 %1$d AP</string>
 	<string name="iteminfo_effect_decrease_movecost">移動コスト減少 -%1$d AP</string>
-	
+
 	<string name="preferences_display_scaling_factor_title">拡大率</string>
 	<string name="preferences_display_scaling_factor">ゲームのあらゆる部分の表示を拡大します。</string>
 	<string name="preferences_display_scaling_factor_normal">通常</string>
 	<string name="preferences_display_scaling_factor_50_percent_larger">1.5x</string>
 	<string name="preferences_display_scaling_factor_double">2.0x</string>
-	
+
 	<string name="inventory_assign">クイック・スロットに入れる</string>
 	<string name="inventory_assign_slot1">Slot 1</string>
 	<string name="inventory_assign_slot2">Slot 2</string>
 	<string name="inventory_assign_slot3">Slot 3</string>
 	<string name="inventory_unassign">クイック・スロットから出す</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.6.10 -->
-	
+
 	<string name="preferences_movement_dpad_position_title">Virtual d-pad</string>
 	<string name="preferences_movement_dpad_position">画面上に仮想的な方向パッドを設置します。</string>
 	<string name="preferences_movement_dpad_minimizeable_title">d-padを最小化する</string>
 	<string name="preferences_movement_dpad_minimizeable">Virtual d-pad が有効である時、d-pad の中心を押すことで最小化できるようにします。</string>
-	
+
 	<string name="preferences_movement_dpad_positions_disabled">無効</string>
 	<string name="preferences_movement_dpad_positions_lower_right">右下</string>
 	<string name="preferences_movement_dpad_positions_lower_left">左下</string>
@@ -328,7 +328,7 @@
 	<string name="preferences_movement_dpad_positions_upper_left">左上</string>
 	<string name="preferences_movement_dpad_positions_upper_right">右上</string>
 	<string name="preferences_movement_dpad_positions_center_top">上</string>
-	
+
 	<string name="actorconditioninfo_constant_effect">状態変化を受けている間</string>
 	<string name="actorconditioninfo_effect_every_round">ラウンドごとに</string>
 	<string name="actorconditioninfo_effect_every_full_round">フル・ラウンドごとに</string>
@@ -337,139 +337,139 @@
 	<string name="bulkselection_select_all">全て</string>
 	<string name="bulkselection_sell_confirmation_title">本当に?</string>
 	<string name="bulkselection_sell_confirmation">本当に %1$s を売りますか? このアイテムは %2$s であって、取り戻すことができないかもしれません。</string>
-	
-<!-- スキル名は翻訳する必要がないかもしれません（ユーザーがフォーラムで調べようとしたとき困るかも）  -->
-<!-- Should skill titles be translated?（japanese users may stuck when trying to collect information from Forum）  -->
-    <string name="skill_title_weapon_chance">正確な攻撃</string>
-    <string name="skill_title_weapon_dmg">強打</string>
-    <string name="skill_title_barter">商人</string>
-    <string name="skill_title_dodge">身交わし</string>
-<!-- Questionable translation: is Bark Skin means "skin like surface of tree"?  -->
-    <string name="skill_title_barkskin">樹のような皮膚</string>
-    <string name="skill_title_more_criticals">より多くのクリティカル</string>
-    <string name="skill_title_better_criticals">より強いクリティカル</string>
-    <string name="skill_title_speed">高速戦闘</string>
-    <string name="skill_title_coinfinder">トレジャーハンター</string>
-    <string name="skill_title_more_exp">すばやい習得</string>
-    <string name="skill_title_cleave">一刀両断</string>
-    <string name="skill_title_eater">死体を貪る</string>
-    <string name="skill_title_fortitude">身につけた忍耐</string>
-    <string name="skill_title_evasion">戦いの回避</string>
-    <string name="skill_title_regeneration">再生力</string>
-    <string name="skill_title_lower_exploss">失敗の達人</string>
-    <string name="skill_title_magicfinder">魔法探知機</string>
-    <string name="skill_title_resistance_mental">強い心</string>
-    <string name="skill_title_resistance_physical_capacity">耐える体</string>
-    <string name="skill_title_resistance_blood_disorder">純粋な血</string>
-    
-    <string name="skill_shortdescription_weapon_chance">命中率を向上</string>
-    <string name="skill_shortdescription_weapon_dmg">ダメージを強化</string>
-    <string name="skill_shortdescription_barter">店での有利な取引</string>
-    <string name="skill_shortdescription_dodge">回避率の向上</string>
-    <string name="skill_shortdescription_barkskin">ダメージ軽減</string>
-    <string name="skill_shortdescription_more_criticals">クリティカルスキルの向上</string>
-    <string name="skill_shortdescription_better_criticals">クリティカル時ダメージの増加</string>
-    <string name="skill_shortdescription_speed">最大行動値(AP)を増加</string>
-    <string name="skill_shortdescription_coinfinder">goldを発見する確率を高める</string>
-    <string name="skill_shortdescription_more_exp">モンスターから得る経験値を増加</string>
-    <string name="skill_shortdescription_cleave">モンスターを殺すたびにAPを回復</string>
-    <string name="skill_shortdescription_eater">モンスターを殺すたびにHPを回復</string>
-    <string name="skill_shortdescription_fortitude">レベルアップのたびに最大HPが増加</string>
-    <string name="skill_shortdescription_evasion">逃走の成功率を上昇</string>
-    <string name="skill_shortdescription_regeneration">毎ラウンドHPが回復</string>
-    <string name="skill_shortdescription_lower_exploss">死亡したときの経験値低下を抑える</string>
-    <string name="skill_shortdescription_magicfinder">魔法のアイテムを発見する確率を高める</string>
-    <string name="skill_shortdescription_resistance_mental">精神に対する状態変化への抵抗力</string>
-    <string name="skill_shortdescription_resistance_physical_capacity">身体能力に対する状態変化への抵抗力</string>
-    <string name="skill_shortdescription_resistance_blood_disorder">血液異常への抵抗力</string>
-    
-    <string name="skill_longdescription_weapon_chance">スキル1レベルにつき、命中率を %1$d 向上させます。</string>
-    <string name="skill_longdescription_weapon_dmg">スキル1レベルにつき、与えるダメージの最小値と最大値を %1$d 増加させます。</string>
-    <string name="skill_longdescription_barter">スキル1レベルごとに、店でアイテムを買うときに割高にされる比率や、売るときに割安にされる比率を %1$d%% ずつ有利にします。</string>
-    <string name="skill_longdescription_dodge">スキル1レベルにつき、回避率を %1$d 向上させます。</string>
-    <string name="skill_longdescription_barkskin">スキル1レベルにつき、ダメージを %1$d ずつ軽減します。</string>
-    <string name="skill_longdescription_more_criticals">スキル1レベルにつき、装備によるクリティカルスキルを %1$d%% 増加させます。(クリティカルスキルの合計値に対する割合であり、この値がそのままクリティカル率に加算されるわけではありません。)</string>
-    <string name="skill_longdescription_better_criticals">スキル1レベルにつき、装備によるクリティカル倍率を %1$d%% 増加させます。</string>
-    <string name="skill_longdescription_speed">スキル1レベルにつき、行動値(AP)の最大値を %1$d ずつ増加させます。</string>
-    <string name="skill_longdescription_coinfinder">スキル1レベルにつき、モンスターがgoldを落とす確率を %1$d%%, モンスターが落とすgoldの量を %2$d%% 増加させます。(そのモンスターが落とすgoldの上限額は増加しません。)</string>
-    <string name="skill_longdescription_more_exp">スキル1レベルにつき、モンスターを倒すことで得る経験値を %1$d%% 増加させます。</string>
-    <string name="skill_longdescription_cleave">敵を殺すたび、スキル1レベルにつき +%1$d ポイントの行動値(AP)が回復します。</string>
-    <string name="skill_longdescription_eater">敵を殺すたび、スキル1レベルにつき +%1$d ポイントの体力(HP)が回復します。</string>
-    <string name="skill_longdescription_fortitude">これ以降のレベルアップのたび、体力(HP)の最大値がスキル1レベルにつき %1$d ポイント増加します。過去のレベルアップにさかのぼって適用されることはなく、将来のレベルアップにのみ影響します。</string>
-    <string name="skill_longdescription_evasion">スキル1レベルにつき、逃走に失敗する確率を %1$d%% 、隣接するモンスターから攻撃される確率を %2$d%% ずつ下げる。</string>
-    <string name="skill_longdescription_regeneration">毎ラウンド、スキル1レベルにつきHPを %1$d ずつ回復すます。</string>
-    <string name="skill_longdescription_lower_exploss">スキル1レベルにつき、死亡時に失う経験値の量を %1$d%% 減少させます。(現在失う量に対する割合で、パーセンテージ・ポイントではありません。) %2$d レベルに達すると、死亡時に経験値を失わなくなります。</string>
-    <string name="skill_longdescription_magicfinder">スキル1レベルにつき、特別なアイテムを発見する確率が %1$d%% づつ増加します。</string>
-    <string name="skill_longdescription_resistance_mental">スキル1レベルにつき、精神に対する状態変化にかかる確率を %1$d%% 低下させます。最大で %2$d%% の低下までです。これには、DazedやWeapon Feeblenessといった、モンスターの攻撃が引き起こす状態変化が含まれます。</string>
-    <string name="skill_longdescription_resistance_physical_capacity">スキル1レベルにつき、身体能力に対する状態変化にかかる確率を %1$d%% 低下させます。最大で %2$d%% の低下までです。これには、Fatigueといった、モンスターの攻撃が引き起こす状態変化が含まれます。</string>
-    <string name="skill_longdescription_resistance_blood_disorder">スキル1レベルにつき、血液異常にかかる確率を %1$d%% 低下させます。最大で %2$d%% の低下までです。これには、Poisonやbleeding woundsといった、モンスターの攻撃が引き起こす状態変化が含まれます。</string>
-    
-    <string name="skillinfo_action_levelup">Level up</string>
-    <string name="skill_current_level">現在のレベル: %1$d</string>
-    <string name="skill_current_level_with_maximum">現在のレベル: %1$d / %2$d</string>
-    <string name="skill_prerequisite_other_skill">このスキルのレベルアップには、%1$d レベル以上の \'\'%2$s\'\' スキルが必要です。</string>
-    <string name="skill_prerequisite_level">このスキルのレベルアップには、あなたのレベルが %1$d 以上必要です。</string>
-    <string name="skill_prerequisite_stat">このスキルのレベルアップには、%1$d 以上の %2$s (基礎能力値)が必要です。</string>
-    <string name="skill_number_of_increases_one">1 個のスキルをレベルアップできます。</string>
-    <string name="skill_number_of_increases_several">%1$d 個のスキルをレベルアップできます。</string>
-    <string name="levelup_adds_new_skillpoint">このレベルアップでは、追加のスキルポイントが1点与えられます!</string>
+
+<!-- スキル名は翻訳する必要がないかもしれません（ユーザーがフォーラムで調べようとしたとき困るかも） -->
+<!-- Should skill titles be translated?（japanese users may stuck when trying to collect information from Forum） -->
+	<string name="skill_title_weapon_chance">正確な攻撃</string>
+	<string name="skill_title_weapon_dmg">強打</string>
+	<string name="skill_title_barter">商人</string>
+	<string name="skill_title_dodge">身交わし</string>
+<!-- Questionable translation: is Bark Skin means "skin like surface of tree"? -->
+	<string name="skill_title_barkskin">樹のような皮膚</string>
+	<string name="skill_title_more_criticals">より多くのクリティカル</string>
+	<string name="skill_title_better_criticals">より強いクリティカル</string>
+	<string name="skill_title_speed">高速戦闘</string>
+	<string name="skill_title_coinfinder">トレジャーハンター</string>
+	<string name="skill_title_more_exp">すばやい習得</string>
+	<string name="skill_title_cleave">一刀両断</string>
+	<string name="skill_title_eater">死体を貪る</string>
+	<string name="skill_title_fortitude">身につけた忍耐</string>
+	<string name="skill_title_evasion">戦いの回避</string>
+	<string name="skill_title_regeneration">再生力</string>
+	<string name="skill_title_lower_exploss">失敗の達人</string>
+	<string name="skill_title_magicfinder">魔法探知機</string>
+	<string name="skill_title_resistance_mental">強い心</string>
+	<string name="skill_title_resistance_physical_capacity">耐える体</string>
+	<string name="skill_title_resistance_blood_disorder">純粋な血</string>
+
+	<string name="skill_shortdescription_weapon_chance">命中率を向上</string>
+	<string name="skill_shortdescription_weapon_dmg">ダメージを強化</string>
+	<string name="skill_shortdescription_barter">店での有利な取引</string>
+	<string name="skill_shortdescription_dodge">回避率の向上</string>
+	<string name="skill_shortdescription_barkskin">ダメージ軽減</string>
+	<string name="skill_shortdescription_more_criticals">クリティカルスキルの向上</string>
+	<string name="skill_shortdescription_better_criticals">クリティカル時ダメージの増加</string>
+	<string name="skill_shortdescription_speed">最大行動値(AP)を増加</string>
+	<string name="skill_shortdescription_coinfinder">goldを発見する確率を高める</string>
+	<string name="skill_shortdescription_more_exp">モンスターから得る経験値を増加</string>
+	<string name="skill_shortdescription_cleave">モンスターを殺すたびにAPを回復</string>
+	<string name="skill_shortdescription_eater">モンスターを殺すたびにHPを回復</string>
+	<string name="skill_shortdescription_fortitude">レベルアップのたびに最大HPが増加</string>
+	<string name="skill_shortdescription_evasion">逃走の成功率を上昇</string>
+	<string name="skill_shortdescription_regeneration">毎ラウンドHPが回復</string>
+	<string name="skill_shortdescription_lower_exploss">死亡したときの経験値低下を抑える</string>
+	<string name="skill_shortdescription_magicfinder">魔法のアイテムを発見する確率を高める</string>
+	<string name="skill_shortdescription_resistance_mental">精神に対する状態変化への抵抗力</string>
+	<string name="skill_shortdescription_resistance_physical_capacity">身体能力に対する状態変化への抵抗力</string>
+	<string name="skill_shortdescription_resistance_blood_disorder">血液異常への抵抗力</string>
+
+	<string name="skill_longdescription_weapon_chance">スキル1レベルにつき、命中率を %1$d 向上させます。</string>
+	<string name="skill_longdescription_weapon_dmg">スキル1レベルにつき、与えるダメージの最小値と最大値を %1$d 増加させます。</string>
+	<string name="skill_longdescription_barter">スキル1レベルごとに、店でアイテムを買うときに割高にされる比率や、売るときに割安にされる比率を %1$d%% ずつ有利にします。</string>
+	<string name="skill_longdescription_dodge">スキル1レベルにつき、回避率を %1$d 向上させます。</string>
+	<string name="skill_longdescription_barkskin">スキル1レベルにつき、ダメージを %1$d ずつ軽減します。</string>
+	<string name="skill_longdescription_more_criticals">スキル1レベルにつき、装備によるクリティカルスキルを %1$d%% 増加させます。(クリティカルスキルの合計値に対する割合であり、この値がそのままクリティカル率に加算されるわけではありません。)</string>
+	<string name="skill_longdescription_better_criticals">スキル1レベルにつき、装備によるクリティカル倍率を %1$d%% 増加させます。</string>
+	<string name="skill_longdescription_speed">スキル1レベルにつき、行動値(AP)の最大値を %1$d ずつ増加させます。</string>
+	<string name="skill_longdescription_coinfinder">スキル1レベルにつき、モンスターがgoldを落とす確率を %1$d%%, モンスターが落とすgoldの量を %2$d%% 増加させます。(そのモンスターが落とすgoldの上限額は増加しません。)</string>
+	<string name="skill_longdescription_more_exp">スキル1レベルにつき、モンスターを倒すことで得る経験値を %1$d%% 増加させます。</string>
+	<string name="skill_longdescription_cleave">敵を殺すたび、スキル1レベルにつき +%1$d ポイントの行動値(AP)が回復します。</string>
+	<string name="skill_longdescription_eater">敵を殺すたび、スキル1レベルにつき +%1$d ポイントの体力(HP)が回復します。</string>
+	<string name="skill_longdescription_fortitude">これ以降のレベルアップのたび、体力(HP)の最大値がスキル1レベルにつき %1$d ポイント増加します。過去のレベルアップにさかのぼって適用されることはなく、将来のレベルアップにのみ影響します。</string>
+	<string name="skill_longdescription_evasion">スキル1レベルにつき、逃走に失敗する確率を %1$d%% 、隣接するモンスターから攻撃される確率を %2$d%% ずつ下げる。</string>
+	<string name="skill_longdescription_regeneration">毎ラウンド、スキル1レベルにつきHPを %1$d ずつ回復すます。</string>
+	<string name="skill_longdescription_lower_exploss">スキル1レベルにつき、死亡時に失う経験値の量を %1$d%% 減少させます。(現在失う量に対する割合で、パーセンテージ・ポイントではありません。) %2$d レベルに達すると、死亡時に経験値を失わなくなります。</string>
+	<string name="skill_longdescription_magicfinder">スキル1レベルにつき、特別なアイテムを発見する確率が %1$d%% づつ増加します。</string>
+	<string name="skill_longdescription_resistance_mental">スキル1レベルにつき、精神に対する状態変化にかかる確率を %1$d%% 低下させます。最大で %2$d%% の低下までです。これには、DazedやWeapon Feeblenessといった、モンスターの攻撃が引き起こす状態変化が含まれます。</string>
+	<string name="skill_longdescription_resistance_physical_capacity">スキル1レベルにつき、身体能力に対する状態変化にかかる確率を %1$d%% 低下させます。最大で %2$d%% の低下までです。これには、Fatigueといった、モンスターの攻撃が引き起こす状態変化が含まれます。</string>
+	<string name="skill_longdescription_resistance_blood_disorder">スキル1レベルにつき、血液異常にかかる確率を %1$d%% 低下させます。最大で %2$d%% の低下までです。これには、Poisonやbleeding woundsといった、モンスターの攻撃が引き起こす状態変化が含まれます。</string>
+
+	<string name="skillinfo_action_levelup">Level up</string>
+	<string name="skill_current_level">現在のレベル: %1$d</string>
+	<string name="skill_current_level_with_maximum">現在のレベル: %1$d / %2$d</string>
+	<string name="skill_prerequisite_other_skill">このスキルのレベルアップには、%1$d レベル以上の \'\'%2$s\'\' スキルが必要です。</string>
+	<string name="skill_prerequisite_level">このスキルのレベルアップには、あなたのレベルが %1$d 以上必要です。</string>
+	<string name="skill_prerequisite_stat">このスキルのレベルアップには、%1$d 以上の %2$s (基礎能力値)が必要です。</string>
+	<string name="skill_number_of_increases_one">1 個のスキルをレベルアップできます。</string>
+	<string name="skill_number_of_increases_several">%1$d 個のスキルをレベルアップできます。</string>
+	<string name="levelup_adds_new_skillpoint">このレベルアップでは、追加のスキルポイントが1点与えられます!</string>
 
 	<string name="loadsave_save_to_new_slot">セーブスロットを新しく作る</string>
 	<string name="loadsave_save_overwrite_confirmation_title">セーブを上書きしますか?</string>
-	<string name="loadsave_save_overwrite_confirmation">このセーブには現在のプレイヤー名(%2$s)と異なるプレイヤー名(%1$s)が記録されています。本当にこのセーブを上書きしてもいいですか?</string> 
-	
+	<string name="loadsave_save_overwrite_confirmation">このセーブには現在のプレイヤー名(%2$s)と異なるプレイヤー名(%1$s)が記録されています。本当にこのセーブを上書きしてもいいですか?</string>
+
 	<string name="iteminfo_displaytypes_ordinary">一般的なアイテム</string>
 	<string name="iteminfo_displaytypes_quest">クエストアイテム</string>
 	<string name="iteminfo_displaytypes_legendary">伝説のアイテム</string>
 	<string name="iteminfo_displaytypes_extraordinary">特別なアイテム</string>
 	<string name="iteminfo_displaytypes_rare">レアアイテム</string>
-	
+
 	<string name="actorconditioninfo_category">状態変化カテゴリ: %1$s</string>
 	<string name="actorcondition_categories_spiritual">霊魂</string>
 	<string name="actorcondition_categories_mental">精神</string>
 	<string name="actorcondition_categories_physical">身体能力</string>
 	<string name="actorcondition_categories_blood">血液異常</string>
-	
+
 	<string name="traitsinfo_base_max_hp">Max HP:</string>
 	<string name="traitsinfo_base_max_ap">Max AP:</string>
 	<string name="menu_save_saving_not_allowed_in_combat">戦闘中にセーブを行うことはできません。</string>
-	
+
 	<string name="preferences_optimized_drawing_title">描画の最適化</string>
 	<string name="preferences_optimized_drawing">グラフィックに乱れを生じる場合、無効にしてください。このオプションは、画面内で変化のあった部分だけを再描画するようにします。</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.6.11 -->
-	
+
 	<string name="skill_title_shadow_bless">シャドウの暗闇の祝福</string>
-    <string name="skill_shortdescription_shadow_bless">すべての種類の状態変化に対する抵抗力</string>
-    <string name="skill_longdescription_shadow_bless">スキル1レベルにつき、あらゆる状態変化にかかる確率を %1$d%% 低下させます。これには、Poison、DazedやFatigueといった、モンスターの攻撃が引き起こすあらゆる状態変化が含まれます。</string>
-    
-    <string name="inventory_movetop">一番上へ</string>
-    <string name="inventory_movebottom">一番下へ</string>
-    <string name="actorinfo_immune_criticals">クリティカルヒット無効</string>
-    <string name="traitsinfo_criticalhit_effectivechance">実効クリティカル率:</string>
+	<string name="skill_shortdescription_shadow_bless">すべての種類の状態変化に対する抵抗力</string>
+	<string name="skill_longdescription_shadow_bless">スキル1レベルにつき、あらゆる状態変化にかかる確率を %1$d%% 低下させます。これには、Poison、DazedやFatigueといった、モンスターの攻撃が引き起こすあらゆる状態変化が含まれます。</string>
 
-   	<string name="skill_title_crit1">内部からの出血</string>
-    <string name="skill_shortdescription_crit1">内出血攻撃の機会を得る</string>
-    <string name="skill_longdescription_crit1">クリティカルヒットを発生させるたび、その攻撃は %1$d%% の確率で対象に内出血を引き起こし、\'Internal bleeding\'の状態変化を対象に与えます。Internal bleedingは攻撃に関する戦闘能力を劇的に下げ、対象は有効な攻撃を当てることが難しくなります。</string>
-   	<string name="skill_title_crit2">骨の粉砕</string>
-    <string name="skill_shortdescription_crit2">骨折攻撃の機会を得る</string>
-    <string name="skill_longdescription_crit2">クリティカルヒットを発生させるたび、その攻撃は %1$d%% の確率で対象の骨を砕き、\'Fracture\'の状態変化を対象に与えます。Fractureは防御に関する戦闘能力を劇的に下げ、対象は次なる攻撃を防ぐことが難しくなります。</string>
-    <string name="skill_title_rejuvenation">復元</string>
-    <string name="skill_shortdescription_rejuvenation">悪い効果を取り除く</string>
-    <string name="skill_longdescription_rejuvenation">1ラウンド(6秒)毎に、%1$d%% の確率で、現在受けている悪い効果の状態変化のうち1つを1段階だけ弱めます。Dazed、Fatigue、Poisonといった、身体能力・精神・血液異常のいずれの状態変化にも効果があります。</string>
-   	<string name="skill_title_taunt">挑発</string>
-    <string name="skill_shortdescription_taunt">攻撃を外した敵のAPを失わせる</string>
-    <string name="skill_longdescription_taunt">敵の攻撃が外れたとき、%1$d%% の確率でその敵は行動値(AP)を %2$d 失います。あなたに対するあらゆる近接攻撃に効果があります。</string>
-   	<string name="skill_title_concussion">頭部への衝撃</string>
-    <string name="skill_shortdescription_concussion">脳震盪攻撃の機会を得る</string>
-    <string name="skill_longdescription_concussion">あなたの命中率より %1$d 以上回避率が低い敵に攻撃するたび、その攻撃は %2$d%% の確率で対象に脳震盪(concussion)を起こします。concussionは攻撃に関する戦闘能力を劇的に下げ、対象は有効な攻撃を当てることが難しくなります。</string>
+	<string name="inventory_movetop">一番上へ</string>
+	<string name="inventory_movebottom">一番下へ</string>
+	<string name="actorinfo_immune_criticals">クリティカルヒット無効</string>
+	<string name="traitsinfo_criticalhit_effectivechance">実効クリティカル率:</string>
 
-    <string name="about_button4">About</string>
+	<string name="skill_title_crit1">内部からの出血</string>
+	<string name="skill_shortdescription_crit1">内出血攻撃の機会を得る</string>
+	<string name="skill_longdescription_crit1">クリティカルヒットを発生させるたび、その攻撃は %1$d%% の確率で対象に内出血を引き起こし、\'Internal bleeding\'の状態変化を対象に与えます。Internal bleedingは攻撃に関する戦闘能力を劇的に下げ、対象は有効な攻撃を当てることが難しくなります。</string>
+	<string name="skill_title_crit2">骨の粉砕</string>
+	<string name="skill_shortdescription_crit2">骨折攻撃の機会を得る</string>
+	<string name="skill_longdescription_crit2">クリティカルヒットを発生させるたび、その攻撃は %1$d%% の確率で対象の骨を砕き、\'Fracture\'の状態変化を対象に与えます。Fractureは防御に関する戦闘能力を劇的に下げ、対象は次なる攻撃を防ぐことが難しくなります。</string>
+	<string name="skill_title_rejuvenation">復元</string>
+	<string name="skill_shortdescription_rejuvenation">悪い効果を取り除く</string>
+	<string name="skill_longdescription_rejuvenation">1ラウンド(6秒)毎に、%1$d%% の確率で、現在受けている悪い効果の状態変化のうち1つを1段階だけ弱めます。Dazed、Fatigue、Poisonといった、身体能力・精神・血液異常のいずれの状態変化にも効果があります。</string>
+	<string name="skill_title_taunt">挑発</string>
+	<string name="skill_shortdescription_taunt">攻撃を外した敵のAPを失わせる</string>
+	<string name="skill_longdescription_taunt">敵の攻撃が外れたとき、%1$d%% の確率でその敵は行動値(AP)を %2$d 失います。あなたに対するあらゆる近接攻撃に効果があります。</string>
+	<string name="skill_title_concussion">頭部への衝撃</string>
+	<string name="skill_shortdescription_concussion">脳震盪攻撃の機会を得る</string>
+	<string name="skill_longdescription_concussion">あなたの命中率より %1$d 以上回避率が低い敵に攻撃するたび、その攻撃は %2$d%% の確率で対象に脳震盪(concussion)を起こします。concussionは攻撃に関する戦闘能力を劇的に下げ、対象は有効な攻撃を当てることが難しくなります。</string>
+
+	<string name="about_button4">About</string>
 
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
-	
+
 	<string name="localize_resources_from_mo_filename">ja.mo</string>
 
 </resources>
\ No newline at end of file
diff --git a/AndorsTrail/res/values-pl/strings.xml b/AndorsTrail/res/values-pl/strings.xml
index 2baee9851..3f0e6e5b3 100644
--- a/AndorsTrail/res/values-pl/strings.xml
+++ b/AndorsTrail/res/values-pl/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- 
+<!--
 Translated by toudi5-bełchatów
 	-->
 
 <resources>
 	<string name="app_name">Andor\'s Trail</string>
 	<string name="app_description">Quest-driven fantasy RPG</string>
-	
+
 	<string name="exit">Wyjście</string>
 	<string name="exit_to_menu">Wyjście do menu</string>
 	<string name="menu_pause">Pauza</string>
@@ -22,17 +22,17 @@ Translated by toudi5-bełchatów
 	<string name="loadsave_selectslot">Wybierz slot</string>
 	<string name="loadsave_slot_empty">(pusty)</string>
 	<string name="savegame_currenthero_displayinfo">poziom %1$d, %2$d dośw, %3$d złoto</string>
-	
+
 	<string name="dialog_loading_message">Wczytywanie zasobów...</string>
 	<string name="dialog_loading_failed_title">Błąd wczytywania</string>
 	<string name="dialog_loading_failed_message">Andor\'s Trail nie mógł wczytać zapisanej gry.\n\n:(\n\nPlik jest uszkodzony lub niekompletny.</string>
 	<string name="dialog_loading_failed_incorrectversion">Andor\'s Trail nie mógł wczytać zapisanej gry. Plik zapisu gry został utworzony w nowszej wersji niż używana aktualnie.</string>
-	
+
 	<string name="dialog_close">Zamknij</string>
-	
+
 	<string name="dialog_confirmexit_title">Wyjście</string>
 	<string name="dialog_confirmexit_message">Czy na pewno chcesz wyjść?</string>
-	
+
 	<string name="dialog_paused_title">Pauza</string>
 	<string name="dialog_paused_message">Gra wstrzymana</string>
 	<string name="dialog_paused_resume">Kontynuuj</string>
@@ -53,13 +53,13 @@ Translated by toudi5-bełchatów
 	<string name="heroinfo_spell">Czary</string>
 	<string name="heroinfo_levelup">Nowy Poziom</string>
 	<string name="heroinfo_level">Poziom</string>
-	<string name="heroinfo_totalexperience">Doświadczenie całkowite</string>	
+	<string name="heroinfo_totalexperience">Doświadczenie całkowite</string>
 	<string name="heroinfo_wornequipment">Używany Ekwipunek</string>
 	<string name="heroinfo_inventory">Inwentarz</string>
 	<string name="heroinfo_gold">Złoto: %1$d</string>
 	<string name="heroinfo_actionpoints">Punkty Wytrzymałości (WT):</string>
 	<string name="heroinfo_quests">Zadania</string>
-	
+
 	<string name="combat_attack">Atak (%1$d WT)</string>
 	<string name="combat_move">Ruch (%1$d WT)</string>
 	<string name="combat_use">Użyj przedmiotu</string>
@@ -72,7 +72,7 @@ Translated by toudi5-bełchatów
 	<string name="combat_status_ap">WT: %1$d</string>
 	<string name="combat_monsterhealth">PŻ:</string>
 	<string name="combat_monsteraction">%1$s atakuje.</string>
-	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string>  -->
+	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string> -->
 	<string name="combat_result_monstermiss">%1$s nie trafił!</string>
 	<string name="combat_result_monsterhit">%1$s odebrał %2$d pż!</string>
 	<string name="combat_result_monsterhitcritical">%1$s uderza ciosem krytycznym za %2$d pż!</string>
@@ -82,7 +82,7 @@ Translated by toudi5-bełchatów
 	<string name="combat_result_herokillsmonster">%1$s umiera!</string>
 	<string name="combat_not_enough_ap">Za mało WT na tę rundę.</string>
 	<string name="combat_hero_dies">Upadasz nieprzytomny, ale na szczęście budzisz się żywy, oszołomiony i poobijany. Tracisz %1$d doświadczenia.</string>
-		
+
 	<string name="inventory_info">Info</string>
 	<string name="inventory_equip">Załóż</string>
 	<string name="inventory_unequip">Zdejmij</string>
@@ -101,35 +101,35 @@ Translated by toudi5-bełchatów
 	<string name="dialog_monsterloot_title">Zwycięstwo</string>
 	<string name="dialog_monsterloot_message">Przeżyłeś potyczkę. </string>
 	<string name="dialog_monsterloot_gainedexp">Zdobyłeś %1$d doświadczenia. </string>
-    
-    <string name="monster_difficulty_veryeasy">Bardzo łatwy</string>
-    <string name="monster_difficulty_easy">Łatwy</string>
-    <string name="monster_difficulty_normal">Średni</string>
-    <string name="monster_difficulty_hard">Trudny</string>
-    <string name="monster_difficulty_veryhard">Bardzo trudny</string>
-    <string name="monster_difficulty_impossible">Niemożliwy</string>
 
-    <string name="actorinfo_class">Klasa:</string>
-    <string name="actorinfo_difficulty">Trudność:</string>
-    <string name="actorinfo_health">Życia:</string>
-    <string name="actorinfo_attacksperturn">Atak/tura:</string>
-    <string name="actorinfo_movesperturn">Ruch/tura:</string>
-    <string name="actorinfo_attack">Atak:</string>
-    <string name="actorinfo_criticalhit">Cios krytyczny:</string>
-    <string name="actorinfo_defense">Obrona:</string>
-    <string name="actorinfo_movecost">Koszt ruchu (WT):</string>
-    <string name="actorinfo_basetraits">Podstawowe statystyki walki (bez ekwipunku i umiejętności)</string>
-    <string name="actorinfo_currenttraits">Statystyki walki (obecne)</string>
-    
-    <string name="traitsinfo_attack_cost">Koszt ataku (WT):</string>
-    <string name="traitsinfo_attack_chance">Szansa ataku:</string>
-    <string name="traitsinfo_attack_damage">Obrażenia ataku:</string>
-    <string name="traitsinfo_criticalhit_skill">Umiejętność ciosu krytycznego:</string>
-    <string name="traitsinfo_criticalhit_multiplier">Mnożnik krytyka:</string>
-    <string name="traitsinfo_defense_chance">Szansa bloku:</string>
-    <string name="traitsinfo_defense_damageresist">Odporność na obrażenia:</string>
-    
-	<!-- <string name="key_required">A specific key is required to pass.</string>  -->
+	<string name="monster_difficulty_veryeasy">Bardzo łatwy</string>
+	<string name="monster_difficulty_easy">Łatwy</string>
+	<string name="monster_difficulty_normal">Średni</string>
+	<string name="monster_difficulty_hard">Trudny</string>
+	<string name="monster_difficulty_veryhard">Bardzo trudny</string>
+	<string name="monster_difficulty_impossible">Niemożliwy</string>
+
+	<string name="actorinfo_class">Klasa:</string>
+	<string name="actorinfo_difficulty">Trudność:</string>
+	<string name="actorinfo_health">Życia:</string>
+	<string name="actorinfo_attacksperturn">Atak/tura:</string>
+	<string name="actorinfo_movesperturn">Ruch/tura:</string>
+	<string name="actorinfo_attack">Atak:</string>
+	<string name="actorinfo_criticalhit">Cios krytyczny:</string>
+	<string name="actorinfo_defense">Obrona:</string>
+	<string name="actorinfo_movecost">Koszt ruchu (WT):</string>
+	<string name="actorinfo_basetraits">Podstawowe statystyki walki (bez ekwipunku i umiejętności)</string>
+	<string name="actorinfo_currenttraits">Statystyki walki (obecne)</string>
+
+	<string name="traitsinfo_attack_cost">Koszt ataku (WT):</string>
+	<string name="traitsinfo_attack_chance">Szansa ataku:</string>
+	<string name="traitsinfo_attack_damage">Obrażenia ataku:</string>
+	<string name="traitsinfo_criticalhit_skill">Umiejętność ciosu krytycznego:</string>
+	<string name="traitsinfo_criticalhit_multiplier">Mnożnik krytyka:</string>
+	<string name="traitsinfo_defense_chance">Szansa bloku:</string>
+	<string name="traitsinfo_defense_damageresist">Odporność na obrażenia:</string>
+
+	<!-- <string name="key_required">A specific key is required to pass.</string> -->
 
 	<string name="iteminfo_category">Kategoria: </string>
 	<string name="iteminfo_action_use">Użyj</string>
@@ -150,15 +150,15 @@ Translated by toudi5-bełchatów
 	<string name="itemcategory_wearable_ring">Można założyć (pierścień)</string>
 	<string name="itemcategory_potion">Napój</string>
 	<string name="itemcategory_other">Inne</string>
-	
+
 	<string name="startscreen_continue">Kontynuuj obecną gre</string>
 	<string name="startscreen_newgame">Nowa Gra</string>
 	<string name="startscreen_newgame_confirm">Stracisz obecny stan gry i postać, na pewno chcesz zacząć nową gre?</string>
 	<string name="startscreen_about">O grze/pomoc</string>
 	<string name="startscreen_enterheroname">Wpisz imię bohatera</string>
 	<string name="startscreen_load">Wczytaj</string>
-	
-	<!-- <string name="conversation_title">%1$s says</string>  -->
+
+	<!-- <string name="conversation_title">%1$s says</string> -->
 	<string name="conversation_rewardexp"> [Zdobyłeś %1$d doświadczenia]</string>
 	<string name="conversation_rewardgold"> [Zdobyłeś %1$d złota]</string>
 	<string name="conversation_lostgold"> [Straciłeś %1$d złota]</string>
@@ -166,7 +166,7 @@ Translated by toudi5-bełchatów
 	<string name="conversation_rewarditems"> [Zdobyłeś %1$d przedmiotów]</string>
 	<string name="conversation_next">Dalej</string>
 	<string name="conversation_leave">Opuść</string>
-	
+
 	<string name="shop_buy">Kup</string>
 	<string name="shop_sell">Sprzedaj</string>
 	<string name="shop_infoitem">Info</string>
@@ -175,7 +175,7 @@ Translated by toudi5-bełchatów
 	<string name="shop_yourgold">Twoje złoto: %1$d</string>
 	<string name="shop_item_bought">%1$s kupione.</string>
 	<string name="shop_item_sold">%1$s sprzedane.</string>
-	
+
 	<string name="levelup_title">Nowy Poziom</string>
 	<string name="levelup_description">Witaj na poziomie %1$d!</string>
 	<string name="levelup_buttontext">Nowy poziom</string>
@@ -187,7 +187,7 @@ Translated by toudi5-bełchatów
 	<string name="levelup_add_attackdamage_description">Dodaje %1$d do obrażenia ataku.</string>
 	<string name="levelup_add_blockchance">Zwiększ szanse blokowania (+%1$d %%)</string>
 	<string name="levelup_add_blockchance_description">Dodaje %1$d%% do szansy zablokowania.</string>
-	
+
 	<string name="dialog_rest_title">Odpocznij</string>
 	<string name="dialog_rest_confirm_message">Chcesz tutaj odpocząć?</string>
 	<string name="dialog_rest_message">Odpocząłeś i odzyskałeś pełne zdrowie.</string>
@@ -205,10 +205,10 @@ Translated by toudi5-bełchatów
 		Zachęcamy do wchodzenia na forum i dyskutowania z innymi graczami.&lt;br /&gt;
 	</string>
 
-	<!-- 
-		This is the GNU GPL v2 text, originally from 
+	<!--
+		This is the GNU GPL v2 text, originally from
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-		For translation of this text, you might be able to find a version in your language here: 
+		For translation of this text, you might be able to find a version in your language here:
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
 	-->
 	<string name="about_contents3">
@@ -220,7 +220,7 @@ Translated by toudi5-bełchatów
 		&lt;br /&gt;
 		For source code and feature requests, please visit the project page at &lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
 	</string>
-	
+
 	<string name="dialog_newversion_title">Witamy</string>
 	<string name="dialog_newversion_message">
 		Dziękujemy za ściągnięcie Andor\'s Trail!\n\n
@@ -228,8 +228,8 @@ Translated by toudi5-bełchatów
 		Proszę odwiedzić forum w celu dyskutowania o grze z innymi graczami lub pomóc w ulepszaniu tej gry jeszcze bardziej ("O grze").\n
 		\n
 		Dziękujemy za całe wasze wsparcie!
-	</string> 
-	
+	</string>
+
 	<string name="questlog_title">Zadania</string>
 	<string name="questlog_includecompleted_prompt">Wybierz zadanie, żeby rozwinąć</string>
 	<string name="questlog_includecompleted_hidecompleted">Schowaj ukończone zadania</string>
@@ -238,7 +238,7 @@ Translated by toudi5-bełchatów
 	<string name="questlog_queststatus">Status: %1$s</string>
 	<string name="questlog_queststatus_inprogress">W trakcie</string>
 	<string name="questlog_queststatus_completed">Zakończone</string>
-	
+
 	<string name="preferences_display_category">Wyświetlacz</string>
 	<string name="preferences_display_fullscreen_title">Pełny ekran</string>
 	<string name="preferences_display_fullscreen">Włącza grę w pełnym ekranie. (Wymaga ponownego uruchomienia gry)</string>
@@ -260,7 +260,7 @@ Translated by toudi5-bełchatów
 	<string name="preferences_attackspeed_fast">Szybkie</string>
 	<string name="preferences_attackspeed_normal">Normalne</string>
 	<string name="preferences_attackspeed_slow">Wolne</string>
-	
+
 	<string name="preferences_movement_category">Ruch</string>
 	<string name="preferences_movementmethod_title">Metoda poruszania się</string>
 	<string name="preferences_movementmethod">Metoda poruszania się i omijania obiektów.</string>
@@ -282,39 +282,39 @@ Translated by toudi5-bełchatów
 	<string name="iteminfo_effect_works_when_killing_target">Kiedy zabijesz cel</string>
 	<string name="iteminfo_effect_works_when_used">Kiedy użyty</string>
 	<string name="iteminfo_effect_works_when_equipped">Kiedy założony</string>
-	
+
 	<string name="iteminfo_effect_decrease_current_hp">Wysysa %1$s PŻ</string>
 	<string name="iteminfo_effect_increase_current_hp">Przywraca %1$s PŻ</string>
 	<string name="iteminfo_effect_decrease_current_ap">Wysysa %1$s WT</string>
 	<string name="iteminfo_effect_increase_current_ap">Przywraca %1$s WT</string>
-	
+
 	<string name="iteminfo_effect_increase_max_hp">Zwiększa maks PŻ o +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_hp">Zmniejsza maks PŻ o %1$d</string>
 	<string name="iteminfo_effect_increase_max_ap">Zwiększa maks WT o +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_ap">Zmniejsza maks WT o %1$d</string>
 	<string name="iteminfo_effect_increase_movecost">Koszt ruchu wzrasta o +%1$d AP</string>
 	<string name="iteminfo_effect_decrease_movecost">Zmniejsza koszt ruchu o %1$d AP</string>
-	
+
 	<string name="preferences_display_scaling_factor_title">Skalowanie obrazu</string>
 	<string name="preferences_display_scaling_factor">Sprawia, że gra będzie wyświetlana w powiększeniu.</string>
 	<string name="preferences_display_scaling_factor_normal">Normalny rozmiar</string>
 	<string name="preferences_display_scaling_factor_50_percent_larger">1.5x powiększony</string>
 	<string name="preferences_display_scaling_factor_double">Podwójnie powiększony</string>
-	
+
 	<string name="inventory_assign">Przypisz szybki slot</string>
 	<string name="inventory_assign_slot1">Slot 1</string>
 	<string name="inventory_assign_slot2">Slot 2</string>
 	<string name="inventory_assign_slot3">Slot 3</string>
 	<string name="inventory_unassign">Un-assign quick slot</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.6.10 -->
-	
+
 	<string name="preferences_movement_dpad_position_title">Wirtualny pad</string>
 	<string name="preferences_movement_dpad_position">Włącza wirtualny pad do poruszania się.</string>
 	<string name="preferences_movement_dpad_minimizeable_title">Minimalizuj w-pad</string>
 	<string name="preferences_movement_dpad_minimizeable">Kiedy wirtualny pad jest włączony, ta opcja pozwala go zminimalizować.</string>
-	
+
 	<string name="preferences_movement_dpad_positions_disabled">Wyłączony</string>
 	<string name="preferences_movement_dpad_positions_lower_right">Prawy dolny róg</string>
 	<string name="preferences_movement_dpad_positions_lower_left">Lewy dolny róg</string>
@@ -324,7 +324,7 @@ Translated by toudi5-bełchatów
 	<string name="preferences_movement_dpad_positions_upper_left">Lewy górny róg</string>
 	<string name="preferences_movement_dpad_positions_upper_right">Prawy górny róg</string>
 	<string name="preferences_movement_dpad_positions_center_top">Na górze po środku</string>
-	
+
 	<string name="actorconditioninfo_constant_effect">Stały efekt</string>
 	<string name="actorconditioninfo_effect_every_round">Co turę</string>
 	<string name="actorconditioninfo_effect_every_full_round">Co pełną turę</string>
@@ -333,146 +333,146 @@ Translated by toudi5-bełchatów
 	<string name="bulkselection_select_all">Wszystko</string>
 	<string name="bulkselection_sell_confirmation_title">Na pewno?</string>
 	<string name="bulkselection_sell_confirmation">Na pewno chcesz sprzedać %1$s? Ten przedmiot jest %2$s i możesz go już nie odzyskać.</string>
-	
-    <string name="skill_title_weapon_chance">Celność</string>
-    <string name="skill_title_weapon_dmg">Twarde uderzenie</string>
-    <string name="skill_title_barter">Kupiec</string>
-    <string name="skill_title_dodge">Unik</string>
-    <string name="skill_title_barkskin">Kamienna Skóra</string>
-    <string name="skill_title_more_criticals">Częstszy Krytyk</string>
-    <string name="skill_title_better_criticals">Mocniejszy Krytyk</string>
-    <string name="skill_title_speed">Wytrzymałość</string>
-    <string name="skill_title_coinfinder">Poszukiwacz Skarbów</string>
-    <string name="skill_title_more_exp">Szybki Uczeń</string>
-    <string name="skill_title_cleave">Wytrzymały</string>
-    <string name="skill_title_eater">Zjadacz Ciał</string>
-    <string name="skill_title_fortitude">Żywotność</string>
-    <string name="skill_title_evasion">Szczurek</string>
-    <string name="skill_title_regeneration">Regeneracja</string>
-    <string name="skill_title_lower_exploss">Śmierć Dusigrosza</string>
-    <string name="skill_title_magicfinder">Szczęście Macieja</string>
-    <string name="skill_title_resistance_mental">Kaszpir</string>
-    <string name="skill_title_resistance_physical_capacity">Hardkorowy</string>
-    <string name="skill_title_resistance_blood_disorder">Nieskażony</string>
-    
-    <string name="skill_shortdescription_weapon_chance">Zwiększona szansa ataku</string>
-    <string name="skill_shortdescription_weapon_dmg">Zwiększone obrażenia ataku</string>
-    <string name="skill_shortdescription_barter">Niższe ceny w sklepie</string>
-    <string name="skill_shortdescription_dodge">Zwiększona szansa bloku</string>
-    <string name="skill_shortdescription_barkskin">Odporność na ataki</string>
-    <string name="skill_shortdescription_more_criticals">Zwiększona umiejętność krytyka</string>
-    <string name="skill_shortdescription_better_criticals">Zwiększone obrażenia krytyka</string>
-    <string name="skill_shortdescription_speed">Zwiększona ilość WT</string>
-    <string name="skill_shortdescription_coinfinder">Większa szansa znalezienia złota</string>
-    <string name="skill_shortdescription_more_exp">Więcej doświadczenia z potworów</string>
-    <string name="skill_shortdescription_cleave">Odzyskuj punkty wytrzymałości po każdym zabiciu potwora</string>
-    <string name="skill_shortdescription_eater">Odzyskuj punkty zdrowia po każdym zabiciu wroga</string>
-    <string name="skill_shortdescription_fortitude">Odzyskuj zdrowie po każdym zdobytym poziomie</string>
-    <string name="skill_shortdescription_evasion">Zwiększona szansa ucieczki</string>
-    <string name="skill_shortdescription_regeneration">Odzyskuj zdrowie po każdej rundzie</string>
-    <string name="skill_shortdescription_lower_exploss">Zmniejsza utracone doświadczenie, po śmierci bohatera</string>
-    <string name="skill_shortdescription_magicfinder">Zwiększona szansa na znalezienie magicznych przedmiotów</string>
-    <string name="skill_shortdescription_resistance_mental">Odporność na obrażenia psychiczne</string>
-    <string name="skill_shortdescription_resistance_physical_capacity">Odporność na obrażenia fizyczne</string>
-    <string name="skill_shortdescription_resistance_blood_disorder">Odporność na obrażenia przeciw skażeniu krwi</string>
-    
-    <string name="skill_longdescription_weapon_chance">Zwiększa szanse ataku o %1$d na każdy poziom umiejętności.</string>
-    <string name="skill_longdescription_weapon_dmg">Zwiększa min i maks obrażenia %1$d na każdy poziom umiejętności.</string>
-    <string name="skill_longdescription_barter">Na każdy poziom umiejętności, sprzedaż i kupno są bardziej opłacalne o %1$d procent.</string>
-    <string name="skill_longdescription_dodge">Zwiększona szansa blokowania o %1$d na każdy poziom umiejętności.</string>
-    <string name="skill_longdescription_barkskin">Zwiększa odporność na obrażenia o %1$d na każdy poziom umiejętności.</string>
-    <string name="skill_longdescription_more_criticals">Zwiększa istniejący krytyk z założonej broni o %1$d %% na każdy poziom umiejętności (procent posiadanych umiejętności krytycznych, ale nie procent ogólny).</string>
-    <string name="skill_longdescription_better_criticals">Increases any existing critical multiplier given by equipment by %1$d %% for each skill level.</string>
-    <string name="skill_longdescription_speed">Zwiększa maksimum wytrzymałości (WT) o %1$d na każdy poziom umiejętności.</string>
-    <string name="skill_longdescription_coinfinder">Zwiększa szanse znalezienia złota w potworze o %1$d %%, oraz zwiększa wartość tego złota o %2$d %% na każdy poziom umiejętności (do maksimum jakie dany potwór może mieć najwięcej).</string>
-    <string name="skill_longdescription_more_exp">Zwiększa otrzymywane doświadczenie po zabiciu potwora o %1$d %% na każdy poziom umiejętności</string>
-    <string name="skill_longdescription_cleave">Daje +%1$d punkt wytrzymałości (WT) na każdy poziom umiejętności.</string>
-    <string name="skill_longdescription_eater">Daje +%1$d punkt życia (PŻ) za każdego zabitego potwora (zależy od poziomu umiejętności).</string>
-    <string name="skill_longdescription_fortitude">Na każdy kolejny nowy poziom, maks PŻ będzie rosło o %1$d na każdy poziom umiejętności. Tylko z nowymi poziomami.</string>
-    <string name="skill_longdescription_evasion">Zmniejsz szanse porażki na ucieczkę z pola walki o %1$d %% i szansę, że podczas porażki w ucieczce potwór zaatakuje o %2$d %%.</string>
-    <string name="skill_longdescription_regeneration">Daje +%1$d punkt życia (PŻ) po każdej walce, na każdy poziom, gdy żaden z potworów do nas nie przylega.</string>
-    <string name="skill_longdescription_lower_exploss">Na każdy poziom umiejętności, redukuje ilość straconego doświadczenia o %1$d %% (procentów dośw. które w danym momencie posiadamy, nie ogólnych procentów). %2$d usunie wszystkie straty wyrządzone przez śmierć.</string>
-    <string name="skill_longdescription_magicfinder">Zwiększa szanse na znalezienie magicznych przedmiotów o %1$d %% na każdy poziom umiejętności.</string>
-    <string name="skill_longdescription_resistance_mental">Zmniejsza szanse na obrażenia psychiczne o %1$d %% na każdy poziom umiejętności, do maks. %2$d %%. Dotyczy potworów, które używają takie ataki jak oszołomienie czy osłabienie broni.</string>
-    <string name="skill_longdescription_resistance_physical_capacity">Zmniejsza szansę na obrażenia fizyczne o %1$d %% na każdy poziom umiejętności, do maks. %2$d %%. Dotyczy potworów, które używają takie ataki jak zmęcznie.</string>
-    <string name="skill_longdescription_resistance_blood_disorder">Zmniejsza szansę skażenia krwi o %1$d %% na każdy poziom umiejętności, do maks. %2$d %%. Dotyczy potworów, które używają takie ataki jak trucizna czy krwawienie.</string>
-    
-    <string name="skillinfo_action_levelup">Nowy Poziom</string>
-    <string name="skill_current_level">Poziom: %1$d</string>
-    <string name="skill_current_level_with_maximum">Poziom: %1$d / %2$d</string>
-    <string name="skill_prerequisite_other_skill">Do awansu tej umiejętności potrzebujesz przynajmniej poziomu %1$d z %2$s umiejętności.</string>
-    <string name="skill_prerequisite_level">Do awansu tej umiejętności potrzebujesz poziomu %1$d.</string>
-    <string name="skill_prerequisite_stat">Do awansu tej umiejętności potrzebujesz przynajmniej %1$d %2$s (podstawowe dane).</string>
-    <string name="skill_number_of_increases_one">Możesz zaznaczyć jedną umiejętność do awansu.</string>
-    <string name="skill_number_of_increases_several">Możesz zaznaczyć %1$d umiejętność do awansu.</string>
-    <string name="levelup_adds_new_skillpoint">Zdobyłeś punkt umiejętności!</string>
+
+	<string name="skill_title_weapon_chance">Celność</string>
+	<string name="skill_title_weapon_dmg">Twarde uderzenie</string>
+	<string name="skill_title_barter">Kupiec</string>
+	<string name="skill_title_dodge">Unik</string>
+	<string name="skill_title_barkskin">Kamienna Skóra</string>
+	<string name="skill_title_more_criticals">Częstszy Krytyk</string>
+	<string name="skill_title_better_criticals">Mocniejszy Krytyk</string>
+	<string name="skill_title_speed">Wytrzymałość</string>
+	<string name="skill_title_coinfinder">Poszukiwacz Skarbów</string>
+	<string name="skill_title_more_exp">Szybki Uczeń</string>
+	<string name="skill_title_cleave">Wytrzymały</string>
+	<string name="skill_title_eater">Zjadacz Ciał</string>
+	<string name="skill_title_fortitude">Żywotność</string>
+	<string name="skill_title_evasion">Szczurek</string>
+	<string name="skill_title_regeneration">Regeneracja</string>
+	<string name="skill_title_lower_exploss">Śmierć Dusigrosza</string>
+	<string name="skill_title_magicfinder">Szczęście Macieja</string>
+	<string name="skill_title_resistance_mental">Kaszpir</string>
+	<string name="skill_title_resistance_physical_capacity">Hardkorowy</string>
+	<string name="skill_title_resistance_blood_disorder">Nieskażony</string>
+
+	<string name="skill_shortdescription_weapon_chance">Zwiększona szansa ataku</string>
+	<string name="skill_shortdescription_weapon_dmg">Zwiększone obrażenia ataku</string>
+	<string name="skill_shortdescription_barter">Niższe ceny w sklepie</string>
+	<string name="skill_shortdescription_dodge">Zwiększona szansa bloku</string>
+	<string name="skill_shortdescription_barkskin">Odporność na ataki</string>
+	<string name="skill_shortdescription_more_criticals">Zwiększona umiejętność krytyka</string>
+	<string name="skill_shortdescription_better_criticals">Zwiększone obrażenia krytyka</string>
+	<string name="skill_shortdescription_speed">Zwiększona ilość WT</string>
+	<string name="skill_shortdescription_coinfinder">Większa szansa znalezienia złota</string>
+	<string name="skill_shortdescription_more_exp">Więcej doświadczenia z potworów</string>
+	<string name="skill_shortdescription_cleave">Odzyskuj punkty wytrzymałości po każdym zabiciu potwora</string>
+	<string name="skill_shortdescription_eater">Odzyskuj punkty zdrowia po każdym zabiciu wroga</string>
+	<string name="skill_shortdescription_fortitude">Odzyskuj zdrowie po każdym zdobytym poziomie</string>
+	<string name="skill_shortdescription_evasion">Zwiększona szansa ucieczki</string>
+	<string name="skill_shortdescription_regeneration">Odzyskuj zdrowie po każdej rundzie</string>
+	<string name="skill_shortdescription_lower_exploss">Zmniejsza utracone doświadczenie, po śmierci bohatera</string>
+	<string name="skill_shortdescription_magicfinder">Zwiększona szansa na znalezienie magicznych przedmiotów</string>
+	<string name="skill_shortdescription_resistance_mental">Odporność na obrażenia psychiczne</string>
+	<string name="skill_shortdescription_resistance_physical_capacity">Odporność na obrażenia fizyczne</string>
+	<string name="skill_shortdescription_resistance_blood_disorder">Odporność na obrażenia przeciw skażeniu krwi</string>
+
+	<string name="skill_longdescription_weapon_chance">Zwiększa szanse ataku o %1$d na każdy poziom umiejętności.</string>
+	<string name="skill_longdescription_weapon_dmg">Zwiększa min i maks obrażenia %1$d na każdy poziom umiejętności.</string>
+	<string name="skill_longdescription_barter">Na każdy poziom umiejętności, sprzedaż i kupno są bardziej opłacalne o %1$d procent.</string>
+	<string name="skill_longdescription_dodge">Zwiększona szansa blokowania o %1$d na każdy poziom umiejętności.</string>
+	<string name="skill_longdescription_barkskin">Zwiększa odporność na obrażenia o %1$d na każdy poziom umiejętności.</string>
+	<string name="skill_longdescription_more_criticals">Zwiększa istniejący krytyk z założonej broni o %1$d %% na każdy poziom umiejętności (procent posiadanych umiejętności krytycznych, ale nie procent ogólny).</string>
+	<string name="skill_longdescription_better_criticals">Increases any existing critical multiplier given by equipment by %1$d %% for each skill level.</string>
+	<string name="skill_longdescription_speed">Zwiększa maksimum wytrzymałości (WT) o %1$d na każdy poziom umiejętności.</string>
+	<string name="skill_longdescription_coinfinder">Zwiększa szanse znalezienia złota w potworze o %1$d %%, oraz zwiększa wartość tego złota o %2$d %% na każdy poziom umiejętności (do maksimum jakie dany potwór może mieć najwięcej).</string>
+	<string name="skill_longdescription_more_exp">Zwiększa otrzymywane doświadczenie po zabiciu potwora o %1$d %% na każdy poziom umiejętności</string>
+	<string name="skill_longdescription_cleave">Daje +%1$d punkt wytrzymałości (WT) na każdy poziom umiejętności.</string>
+	<string name="skill_longdescription_eater">Daje +%1$d punkt życia (PŻ) za każdego zabitego potwora (zależy od poziomu umiejętności).</string>
+	<string name="skill_longdescription_fortitude">Na każdy kolejny nowy poziom, maks PŻ będzie rosło o %1$d na każdy poziom umiejętności. Tylko z nowymi poziomami.</string>
+	<string name="skill_longdescription_evasion">Zmniejsz szanse porażki na ucieczkę z pola walki o %1$d %% i szansę, że podczas porażki w ucieczce potwór zaatakuje o %2$d %%.</string>
+	<string name="skill_longdescription_regeneration">Daje +%1$d punkt życia (PŻ) po każdej walce, na każdy poziom, gdy żaden z potworów do nas nie przylega.</string>
+	<string name="skill_longdescription_lower_exploss">Na każdy poziom umiejętności, redukuje ilość straconego doświadczenia o %1$d %% (procentów dośw. które w danym momencie posiadamy, nie ogólnych procentów). %2$d usunie wszystkie straty wyrządzone przez śmierć.</string>
+	<string name="skill_longdescription_magicfinder">Zwiększa szanse na znalezienie magicznych przedmiotów o %1$d %% na każdy poziom umiejętności.</string>
+	<string name="skill_longdescription_resistance_mental">Zmniejsza szanse na obrażenia psychiczne o %1$d %% na każdy poziom umiejętności, do maks. %2$d %%. Dotyczy potworów, które używają takie ataki jak oszołomienie czy osłabienie broni.</string>
+	<string name="skill_longdescription_resistance_physical_capacity">Zmniejsza szansę na obrażenia fizyczne o %1$d %% na każdy poziom umiejętności, do maks. %2$d %%. Dotyczy potworów, które używają takie ataki jak zmęcznie.</string>
+	<string name="skill_longdescription_resistance_blood_disorder">Zmniejsza szansę skażenia krwi o %1$d %% na każdy poziom umiejętności, do maks. %2$d %%. Dotyczy potworów, które używają takie ataki jak trucizna czy krwawienie.</string>
+
+	<string name="skillinfo_action_levelup">Nowy Poziom</string>
+	<string name="skill_current_level">Poziom: %1$d</string>
+	<string name="skill_current_level_with_maximum">Poziom: %1$d / %2$d</string>
+	<string name="skill_prerequisite_other_skill">Do awansu tej umiejętności potrzebujesz przynajmniej poziomu %1$d z %2$s umiejętności.</string>
+	<string name="skill_prerequisite_level">Do awansu tej umiejętności potrzebujesz poziomu %1$d.</string>
+	<string name="skill_prerequisite_stat">Do awansu tej umiejętności potrzebujesz przynajmniej %1$d %2$s (podstawowe dane).</string>
+	<string name="skill_number_of_increases_one">Możesz zaznaczyć jedną umiejętność do awansu.</string>
+	<string name="skill_number_of_increases_several">Możesz zaznaczyć %1$d umiejętność do awansu.</string>
+	<string name="levelup_adds_new_skillpoint">Zdobyłeś punkt umiejętności!</string>
 
 	<string name="loadsave_save_to_new_slot">Stwórz nowy slot zapisu</string>
 	<string name="loadsave_save_overwrite_confirmation_title">Nadpisać grę?</string>
-	<string name="loadsave_save_overwrite_confirmation">Ten zapis posiada bohatera o innym imieniu (%1$s) niż ten którym grasz obecnie (%2$s). Na pewno chcesz nadpisać grę?</string> 
-	
+	<string name="loadsave_save_overwrite_confirmation">Ten zapis posiada bohatera o innym imieniu (%1$s) niż ten którym grasz obecnie (%2$s). Na pewno chcesz nadpisać grę?</string>
+
 	<string name="iteminfo_displaytypes_ordinary">Zwykły</string>
 	<string name="iteminfo_displaytypes_quest">Przedmiot do zadania</string>
 	<string name="iteminfo_displaytypes_legendary">Legendarny</string>
 	<string name="iteminfo_displaytypes_extraordinary">Niezwykły</string>
 	<string name="iteminfo_displaytypes_rare">Rzadki</string>
-	
+
 	<string name="actorconditioninfo_category">Kategoria: %1$s</string>
 	<string name="actorcondition_categories_spiritual">Duchowy</string>
 	<string name="actorcondition_categories_mental">Psychiczny</string>
 	<string name="actorcondition_categories_physical">Fizyczny</string>
 	<string name="actorcondition_categories_blood">Skażający krew</string>
-	
+
 	<string name="traitsinfo_base_max_hp">Maks PŻ:</string>
 	<string name="traitsinfo_base_max_ap">Maks WT:</string>
 	<string name="menu_save_saving_not_allowed_in_combat">Nie można zapisać gry, gdy walczysz.</string>
-	
+
 	<string name="preferences_optimized_drawing_title">Zoptymalizowane rysowanie</string>
 	<string name="preferences_optimized_drawing">Wyłącz to jeśli masz problemy z grafiką. Włączenie tej opcji spowoduje przerysowanie tylko niektórych części co klatkę.</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.6.11 -->
-	
+
 	<string name="skill_title_shadow_bless">Mroczne błogosławieństwo Cieni</string>
-    <string name="skill_shortdescription_shadow_bless">Odporność na dodatkowe ataki wrogów</string>
-    <string name="skill_longdescription_shadow_bless">Zmniejsza prawdopodobieństwo na dodatkowe ataki wrogów o %1$d %%. To dotyczy wszystkich dodatkowych ataków przez potwory takie jak: oszołomienie, zmęczenie, trucizna.</string>
-    
-    <string name="inventory_movetop">Idź w górę</string>
-    <string name="inventory_movebottom">Idź w dół</string>
-    <string name="actorinfo_immune_criticals">Odporność na trafienia krytyka</string>
-    <string name="traitsinfo_criticalhit_effectivechance">efektywność ciosu krytycznego:</string>
+	<string name="skill_shortdescription_shadow_bless">Odporność na dodatkowe ataki wrogów</string>
+	<string name="skill_longdescription_shadow_bless">Zmniejsza prawdopodobieństwo na dodatkowe ataki wrogów o %1$d %%. To dotyczy wszystkich dodatkowych ataków przez potwory takie jak: oszołomienie, zmęczenie, trucizna.</string>
 
-   	<string name="skill_title_crit1">Krwawienie wewnętrzne</string>
-    <string name="skill_shortdescription_crit1">Szansa na krwawienie</string>
-    <string name="skill_longdescription_crit1">Za każdy udany krytyk, jest %1$d %% szansy, że uderzenie rozpocznie krwawienie wroga \'Krwawienie wewnętrzne\'. Krwawienie osłabia ofensywę wroga, pogarszając jego celność.</string>
-   	<string name="skill_title_crit2">Złamanie</string>
-    <string name="skill_shortdescription_crit2">Szansa na złamanie kości</string>
-    <string name="skill_longdescription_crit2">Za każdy udany krytyk, jest %1$d %% szansy na złamanie kości wroga \'Złamanie\' To osłabi defensywę wroga, które będzie bardziej podatny na ataki.</string>
-    <string name="skill_title_rejuvenation">Odmłodzenie</string>
-    <string name="skill_shortdescription_rejuvenation">Szansa na usunięcie efektu</string>
-    <string name="skill_longdescription_rejuvenation">Co rundę (6 sekund), jest %1$d %% szansy, że jeden z negatywnych efektów zostanie obniżony o jeden. To dotyczy wszystkich tymczasowych efektów jakimi są; psychiczne obrażenia takie jak oszołomienie, fizyczne obrażenia takie jak zmęczenie i również skażenia krwi takie jak trucizna.</string>
-   	<string name="skill_title_taunt">Kpina</string>
-    <string name="skill_shortdescription_taunt">Atakujący traci WT jeśli chybi</string>
-    <string name="skill_longdescription_taunt">Kiedy atakujący wykona atak i chybi, jest %1$d %% szansy, że atakujący straci %2$d punktów wytrzymałości (WT). To dotyczy wszystkich ataków wręcz przeciw tobie.</string>
-   	<string name="skill_title_concussion">Wstrząs</string>
-    <string name="skill_shortdescription_concussion">Szansa na wstrząs</string>
-    <string name="skill_longdescription_concussion">Kiedy atakujesz na cel, którego szanse na blok (SB) jest %1$d niższa niż twoja szansa na trafienie (SA), jest %2$d %% szansy, że uderzenie skończy się wstrząsem dla wroga. Wstrząs osłabi zdolności ofensywne wroga, który będzie częściej chybiał.</string>
+	<string name="inventory_movetop">Idź w górę</string>
+	<string name="inventory_movebottom">Idź w dół</string>
+	<string name="actorinfo_immune_criticals">Odporność na trafienia krytyka</string>
+	<string name="traitsinfo_criticalhit_effectivechance">efektywność ciosu krytycznego:</string>
+
+	<string name="skill_title_crit1">Krwawienie wewnętrzne</string>
+	<string name="skill_shortdescription_crit1">Szansa na krwawienie</string>
+	<string name="skill_longdescription_crit1">Za każdy udany krytyk, jest %1$d %% szansy, że uderzenie rozpocznie krwawienie wroga \'Krwawienie wewnętrzne\'. Krwawienie osłabia ofensywę wroga, pogarszając jego celność.</string>
+	<string name="skill_title_crit2">Złamanie</string>
+	<string name="skill_shortdescription_crit2">Szansa na złamanie kości</string>
+	<string name="skill_longdescription_crit2">Za każdy udany krytyk, jest %1$d %% szansy na złamanie kości wroga \'Złamanie\' To osłabi defensywę wroga, które będzie bardziej podatny na ataki.</string>
+	<string name="skill_title_rejuvenation">Odmłodzenie</string>
+	<string name="skill_shortdescription_rejuvenation">Szansa na usunięcie efektu</string>
+	<string name="skill_longdescription_rejuvenation">Co rundę (6 sekund), jest %1$d %% szansy, że jeden z negatywnych efektów zostanie obniżony o jeden. To dotyczy wszystkich tymczasowych efektów jakimi są; psychiczne obrażenia takie jak oszołomienie, fizyczne obrażenia takie jak zmęczenie i również skażenia krwi takie jak trucizna.</string>
+	<string name="skill_title_taunt">Kpina</string>
+	<string name="skill_shortdescription_taunt">Atakujący traci WT jeśli chybi</string>
+	<string name="skill_longdescription_taunt">Kiedy atakujący wykona atak i chybi, jest %1$d %% szansy, że atakujący straci %2$d punktów wytrzymałości (WT). To dotyczy wszystkich ataków wręcz przeciw tobie.</string>
+	<string name="skill_title_concussion">Wstrząs</string>
+	<string name="skill_shortdescription_concussion">Szansa na wstrząs</string>
+	<string name="skill_longdescription_concussion">Kiedy atakujesz na cel, którego szanse na blok (SB) jest %1$d niższa niż twoja szansa na trafienie (SA), jest %2$d %% szansy, że uderzenie skończy się wstrząsem dla wroga. Wstrząs osłabi zdolności ofensywne wroga, który będzie częściej chybiał.</string>
+
+	<string name="about_button4">O grze</string>
 
-    <string name="about_button4">O grze</string>
-	
 	<!-- =========================================== -->
 	<!-- Added in v0.6.12 -->
-	
-    <string name="preferences_ui_category">Interfejs</string>
-    <string name="preferences_ui_enable_animations_title">Włącz animacje</string>
-    <string name="preferences_ui_enable_animations">Pokazuje animacje różnych części interfejsu np. pasek walki.</string>
-    <string name="menu_button_worldmap">Mapa</string>
-    <string name="menu_button_worldmap_failed">Mapa nie może być wyświetlona.</string>
-    <string name="display_worldmap_not_available">Mapa nie może być wyświetlona w tym miejscu.</string>
-    <string name="display_worldmap_title">Mapa</string>
-    
+
+	<string name="preferences_ui_category">Interfejs</string>
+	<string name="preferences_ui_enable_animations_title">Włącz animacje</string>
+	<string name="preferences_ui_enable_animations">Pokazuje animacje różnych części interfejsu np. pasek walki.</string>
+	<string name="menu_button_worldmap">Mapa</string>
+	<string name="menu_button_worldmap_failed">Mapa nie może być wyświetlona.</string>
+	<string name="display_worldmap_not_available">Mapa nie może być wyświetlona w tym miejscu.</string>
+	<string name="display_worldmap_title">Mapa</string>
+
 	<string name="inventory_equip_offhand">Załóż (od ręki)</string>
-	
+
 	<string name="iteminfo_effect_weapon_attack_cost">Koszt Ataku: %1$d WT</string>
 	<string name="iteminfo_effect_increase_attack_cost">Zwiększa koszt ataku o %1$d WT</string>
 	<string name="iteminfo_effect_decrease_attack_cost">Zmniejsza koszt ataku o %1$d WT</string>
@@ -496,19 +496,19 @@ Translated by toudi5-bełchatów
 	<string name="iteminfo_effect_decrease_use_cost">Zmniejsza koszt WT używania przedmiotów w walce o %1$d AP</string>
 	<string name="iteminfo_effect_increase_reequip_cost">Zwiększa koszt WT zakładanych przedmiotów w walce o %1$d AP</string>
 	<string name="iteminfo_effect_decrease_reequip_cost">Zwiększa koszt WT zakładanych przedmiotów w walce o %1$d AP</string>
-	
-	<string name="loadsave_save_overwrite_confirmation_all">Jesteś pewny, że chcesz nadpisać grę?</string> 
+
+	<string name="loadsave_save_overwrite_confirmation_all">Jesteś pewny, że chcesz nadpisać grę?</string>
 	<string name="loadsave_save_overwrite_confirmation_slot">(slot %1$d)</string>
 	<string name="preferences_display_overwrite_savegame_entries_always_confirm">Zawsze pokazuj okienko potwierdzeń</string>
 	<string name="preferences_display_overwrite_savegame_entries_confirm_overwrite">Pokazuj tylko, gdy nadpisuję plik z innym imieniem bohatera</string>
 	<string name="preferences_display_overwrite_savegame_entries_never_confirm">Nigdy nie pokazuj okienka potwierdzeń</string>
 	<string name="preferences_dialog_overwrite_savegame_title">Potwierdź nadpisanie gry</string>
 	<string name="preferences_dialog_overwrite_savegame">Zadaje pytanie zawsze, gdy chcesz nadpisać grę na slocie, który jest już zajęty.</string>
-	
+
 
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
-	
+
 	<string name="localize_resources_from_mo_filename">pl.mo</string>
-			
+
 </resources>
diff --git a/AndorsTrail/res/values-pl/strings_about.xml b/AndorsTrail/res/values-pl/strings_about.xml
index 22d2a048a..3cc1692d0 100644
--- a/AndorsTrail/res/values-pl/strings_about.xml
+++ b/AndorsTrail/res/values-pl/strings_about.xml
@@ -27,7 +27,7 @@
 <div><b>Atak</b> - [3WT] *</div>
 <img alt="attacking" src="doubleattackexample.png" />
 <p>* (Equipping Gear &amp; Korzystanie z przedmiotów może wpłynąć na ilość WT &amp; koszt użycia)</p>
-	
+
 <div><b>Używanie Przedmiotów</b> - [5WT]</div>
 <div><b>Ucieczka</b> - [6WT]</div>
 
diff --git a/AndorsTrail/res/values-pt-rBR/strings.xml b/AndorsTrail/res/values-pt-rBR/strings.xml
index 6645aac1c..5a9fe0023 100644
--- a/AndorsTrail/res/values-pt-rBR/strings.xml
+++ b/AndorsTrail/res/values-pt-rBR/strings.xml
@@ -68,7 +68,7 @@
 	<string name="combat_status_ap">AP: %1$d</string>
 	<string name="combat_monsterhealth">HP:</string>
 	<string name="combat_monsteraction">%1$s está atacando.</string>
-	<!-- <string name="combat_cannotexitcombat">Não pode fugir do combate uma vez que está cercado por esse lado. Tente a fuga por onde não haja monstros.</string>  -->
+	<!-- <string name="combat_cannotexitcombat">Não pode fugir do combate uma vez que está cercado por esse lado. Tente a fuga por onde não haja monstros.</string> -->
 	<string name="combat_result_monstermiss">%1$s falha!</string>
 	<string name="combat_result_monsterhit">%1$s acertou-lhe e perdeu %2$d hp!</string>
 	<string name="combat_result_monsterhitcritical">%1$s acertou-lhe com um golpe crítico e perdeu %2$d hp!</string>
@@ -98,34 +98,34 @@
 	<string name="dialog_monsterloot_message">Sobreviveu ao combate. </string>
 	<string name="dialog_monsterloot_gainedexp">Ganhou %1$d de experiência. </string>
 
-    <string name="monster_difficulty_veryeasy">Muito fácil</string>
-    <string name="monster_difficulty_easy">Fácil</string>
-    <string name="monster_difficulty_normal">Normal</string>
-    <string name="monster_difficulty_hard">Difícil</string>
-    <string name="monster_difficulty_veryhard">Muito difícil</string>
-    <string name="monster_difficulty_impossible">Impossível</string>
+	<string name="monster_difficulty_veryeasy">Muito fácil</string>
+	<string name="monster_difficulty_easy">Fácil</string>
+	<string name="monster_difficulty_normal">Normal</string>
+	<string name="monster_difficulty_hard">Difícil</string>
+	<string name="monster_difficulty_veryhard">Muito difícil</string>
+	<string name="monster_difficulty_impossible">Impossível</string>
 
-    <string name="actorinfo_class">Classe:</string>
-    <string name="actorinfo_difficulty">Dificuldade:</string>
-    <string name="actorinfo_health">Saúde:</string>
-    <string name="actorinfo_attacksperturn">Ataques/turno:</string>
-    <string name="actorinfo_movesperturn">Deslocamento/turno:</string>
-    <string name="actorinfo_attack">Ataque:</string>
-    <string name="actorinfo_criticalhit">Golpe crítico:</string>
-    <string name="actorinfo_defense">Defesa:</string>
-    <string name="actorinfo_movecost">Custo de deslocamento (AP):</string>
-    <string name="actorinfo_basetraits">Estatíticas de combate base (sem equipamento nem habilidades)</string>
-    <string name="actorinfo_currenttraits">Estatísticas de combate (atual)</string>
+	<string name="actorinfo_class">Classe:</string>
+	<string name="actorinfo_difficulty">Dificuldade:</string>
+	<string name="actorinfo_health">Saúde:</string>
+	<string name="actorinfo_attacksperturn">Ataques/turno:</string>
+	<string name="actorinfo_movesperturn">Deslocamento/turno:</string>
+	<string name="actorinfo_attack">Ataque:</string>
+	<string name="actorinfo_criticalhit">Golpe crítico:</string>
+	<string name="actorinfo_defense">Defesa:</string>
+	<string name="actorinfo_movecost">Custo de deslocamento (AP):</string>
+	<string name="actorinfo_basetraits">Estatíticas de combate base (sem equipamento nem habilidades)</string>
+	<string name="actorinfo_currenttraits">Estatísticas de combate (atual)</string>
 
-    <string name="traitsinfo_attack_cost">Custo de ataque (AP):</string>
-    <string name="traitsinfo_attack_chance">Probabilidade de ataque:</string>
-    <string name="traitsinfo_attack_damage">Danos de ataque:</string>
-    <string name="traitsinfo_criticalhit_skill">Probabilidade de golpe crítico:</string>
-    <string name="traitsinfo_criticalhit_multiplier">Multiplicador de golpe crítico:</string>
-    <string name="traitsinfo_defense_chance">Probabilidade de bloqueio:</string>
-    <string name="traitsinfo_defense_damageresist">Resistência a danos:</string>
+	<string name="traitsinfo_attack_cost">Custo de ataque (AP):</string>
+	<string name="traitsinfo_attack_chance">Probabilidade de ataque:</string>
+	<string name="traitsinfo_attack_damage">Danos de ataque:</string>
+	<string name="traitsinfo_criticalhit_skill">Probabilidade de golpe crítico:</string>
+	<string name="traitsinfo_criticalhit_multiplier">Multiplicador de golpe crítico:</string>
+	<string name="traitsinfo_defense_chance">Probabilidade de bloqueio:</string>
+	<string name="traitsinfo_defense_damageresist">Resistência a danos:</string>
 
-	<!-- <string name="key_required">É necessária uma chave específica para passar.</string>  -->
+	<!-- <string name="key_required">É necessária uma chave específica para passar.</string> -->
 
 	<string name="iteminfo_category">Categoria: </string>
 	<string name="iteminfo_action_use">Usar</string>
@@ -154,7 +154,7 @@
 	<string name="startscreen_enterheroname">Escreva o nome do herói</string>
 	<string name="startscreen_load">Carregar</string>
 
-	<!-- <string name="conversation_title">%1$s diz</string>  -->
+	<!-- <string name="conversation_title">%1$s diz</string> -->
 	<string name="conversation_rewardexp"> [Ganhou %1$d de experiência]</string>
 	<string name="conversation_rewardgold"> [Ganhou %1$d moedas]</string>
 	<string name="conversation_lostgold"> [Perdeu %1$d moedas]</string>
@@ -333,78 +333,78 @@
 	<string name="bulkselection_sell_confirmation_title">Tem certeza?</string>
 	<string name="bulkselection_sell_confirmation">Tem certeza que quer vender %1$s? Este objeto é %2$s e poderá não conseguir recuperar depois.</string>
 
-    <string name="skill_title_weapon_chance">Precisão de Arma</string>
-    <string name="skill_title_weapon_dmg">Golpe Forte</string>
-    <string name="skill_title_barter">Mercador</string>
-    <string name="skill_title_dodge">Esquivar</string>
-    <string name="skill_title_barkskin">Pele Espessa</string>
-    <string name="skill_title_more_criticals">Mais Ataques Críticos</string>
-    <string name="skill_title_better_criticals">Melhores Ataques Críticos</string>
-    <string name="skill_title_speed">Velocidade de Combate</string>
-    <string name="skill_title_coinfinder">Caçador de Tesouros</string>
-    <string name="skill_title_more_exp">Aprendizagem Rápida</string>
-    <string name="skill_title_cleave">Rasgar</string>
-    <string name="skill_title_eater">Comedor de Corpos</string>
-    <string name="skill_title_fortitude">Força Aumentada</string>
-    <string name="skill_title_evasion">Evasão</string>
-    <string name="skill_title_regeneration">Regeneração</string>
-    <string name="skill_title_lower_exploss">Controle de Falhas</string>
-    <string name="skill_title_magicfinder">Descobridor de Magia</string>
-    <string name="skill_title_resistance_mental">Mente Forte</string>
-    <string name="skill_title_resistance_physical_capacity">Corpo Resistente</string>
-    <string name="skill_title_resistance_blood_disorder">Sangue Puro</string>
+	<string name="skill_title_weapon_chance">Precisão de Arma</string>
+	<string name="skill_title_weapon_dmg">Golpe Forte</string>
+	<string name="skill_title_barter">Mercador</string>
+	<string name="skill_title_dodge">Esquivar</string>
+	<string name="skill_title_barkskin">Pele Espessa</string>
+	<string name="skill_title_more_criticals">Mais Ataques Críticos</string>
+	<string name="skill_title_better_criticals">Melhores Ataques Críticos</string>
+	<string name="skill_title_speed">Velocidade de Combate</string>
+	<string name="skill_title_coinfinder">Caçador de Tesouros</string>
+	<string name="skill_title_more_exp">Aprendizagem Rápida</string>
+	<string name="skill_title_cleave">Rasgar</string>
+	<string name="skill_title_eater">Comedor de Corpos</string>
+	<string name="skill_title_fortitude">Força Aumentada</string>
+	<string name="skill_title_evasion">Evasão</string>
+	<string name="skill_title_regeneration">Regeneração</string>
+	<string name="skill_title_lower_exploss">Controle de Falhas</string>
+	<string name="skill_title_magicfinder">Descobridor de Magia</string>
+	<string name="skill_title_resistance_mental">Mente Forte</string>
+	<string name="skill_title_resistance_physical_capacity">Corpo Resistente</string>
+	<string name="skill_title_resistance_blood_disorder">Sangue Puro</string>
 
-    <string name="skill_shortdescription_weapon_chance">Aumento de probabilidade de ataque</string>
-    <string name="skill_shortdescription_weapon_dmg">Aumento de danos em ataque</string>
-    <string name="skill_shortdescription_barter">Melhores preços</string>
-    <string name="skill_shortdescription_dodge">Aumento de probabilidade de bloqueio</string>
-    <string name="skill_shortdescription_barkskin">Resistência a danos</string>
-    <string name="skill_shortdescription_more_criticals">Aumento de probabilidade de ataques críticos</string>
-    <string name="skill_shortdescription_better_criticals">Aumento de danos em ataques críticos</string>
-    <string name="skill_shortdescription_speed">Aumento do máximo de pontos de acção</string>
-    <string name="skill_shortdescription_coinfinder">Maior probabilidade de encontrar moedas</string>
-    <string name="skill_shortdescription_more_exp">Mais experiência com morte de monstros</string>
-    <string name="skill_shortdescription_cleave">Recupera pontos de acção com cada morte</string>
-    <string name="skill_shortdescription_eater">Recupera pontos de saúde com cada morte</string>
-    <string name="skill_shortdescription_fortitude">Ganho de saúde em cada subida de nível</string>
-    <string name="skill_shortdescription_evasion">Aumento da probabilidade de fuga</string>
-    <string name="skill_shortdescription_regeneration">Ganho de saúde em cada turno</string>
-    <string name="skill_shortdescription_lower_exploss">Diminuição da quantidade de pontos de experiência perdidos ao morrer</string>
-    <string name="skill_shortdescription_magicfinder">Aumento da probabilidade de encontrar objetos mágicos</string>
-    <string name="skill_shortdescription_resistance_mental">Resistência contra encantamentos que incidem sobre a mente</string>
-    <string name="skill_shortdescription_resistance_physical_capacity">Resistência contra encantamentos que incidem sobre a capacidade física</string>
-    <string name="skill_shortdescription_resistance_blood_disorder">Resistência contra doenças do sangue</string>
+	<string name="skill_shortdescription_weapon_chance">Aumento de probabilidade de ataque</string>
+	<string name="skill_shortdescription_weapon_dmg">Aumento de danos em ataque</string>
+	<string name="skill_shortdescription_barter">Melhores preços</string>
+	<string name="skill_shortdescription_dodge">Aumento de probabilidade de bloqueio</string>
+	<string name="skill_shortdescription_barkskin">Resistência a danos</string>
+	<string name="skill_shortdescription_more_criticals">Aumento de probabilidade de ataques críticos</string>
+	<string name="skill_shortdescription_better_criticals">Aumento de danos em ataques críticos</string>
+	<string name="skill_shortdescription_speed">Aumento do máximo de pontos de acção</string>
+	<string name="skill_shortdescription_coinfinder">Maior probabilidade de encontrar moedas</string>
+	<string name="skill_shortdescription_more_exp">Mais experiência com morte de monstros</string>
+	<string name="skill_shortdescription_cleave">Recupera pontos de acção com cada morte</string>
+	<string name="skill_shortdescription_eater">Recupera pontos de saúde com cada morte</string>
+	<string name="skill_shortdescription_fortitude">Ganho de saúde em cada subida de nível</string>
+	<string name="skill_shortdescription_evasion">Aumento da probabilidade de fuga</string>
+	<string name="skill_shortdescription_regeneration">Ganho de saúde em cada turno</string>
+	<string name="skill_shortdescription_lower_exploss">Diminuição da quantidade de pontos de experiência perdidos ao morrer</string>
+	<string name="skill_shortdescription_magicfinder">Aumento da probabilidade de encontrar objetos mágicos</string>
+	<string name="skill_shortdescription_resistance_mental">Resistência contra encantamentos que incidem sobre a mente</string>
+	<string name="skill_shortdescription_resistance_physical_capacity">Resistência contra encantamentos que incidem sobre a capacidade física</string>
+	<string name="skill_shortdescription_resistance_blood_disorder">Resistência contra doenças do sangue</string>
 
-    <string name="skill_longdescription_weapon_chance">Aumenta a probabilidade de ataque em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_weapon_dmg">Aumenta o dano mínimo e máximo em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_barter">Por cada nível de habilidade, diminui a penalização monetária de compra e venda em %1$d pontos percentuais.</string>
-    <string name="skill_longdescription_dodge">Aumenta a probabilidade de bloqueio em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_barkskin">Aumenta a resistência a danos em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_more_criticals">Aumenta todas as probabilidades de ataque crítico dadas por equipamento em %1$d %% por cada nível de habilidade (percentagem do valor da probabilidade de ataque crítico existente, não pontos percentuais).</string>
-    <string name="skill_longdescription_better_criticals">Aumenta todos os multiplicadores de ataque crítico dados por equipamento em %1$d %% por cada nível de habilidade.</string>
-    <string name="skill_longdescription_speed">Aumenta o máximo de pontos de ação (AP) em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_coinfinder">Aumenta a probabilidade de encontrar moedas na morte de monstros em %1$d %%, e aumenta a quantidade de moedas por cada morte em %2$d %% por cada nível de habilidade (até ao valor máximo que cada monstro possa dar).</string>
-    <string name="skill_longdescription_more_exp">Aumenta a quantidade de exp dada por derrotar monstros em %1$d %% por cada nível de habilidade.</string>
-    <string name="skill_longdescription_cleave">Dá +%1$d pontos de acção (AP) em cada morte por cada nível de habilidade.</string>
-    <string name="skill_longdescription_eater">Dá +%1$d pontos de vida (HP) em cada morte por cada nível de habilidade.</string>
-    <string name="skill_longdescription_fortitude">Em cada subida de nível seguinte, o máximo de pontos de vida (HP) será aumentado em %1$d por cada nível de habilidade. Isto não é aplicado retroativamente, apenas as subidas de nível seguintes serão afetadas.</string>
-    <string name="skill_longdescription_evasion">Por cada nível de habilidade, reduz a probabilidade de tentativas de fuga falhadas em %1$d %% e a probabilidade de um monstro numa posição adjacente ataque em %2$d %%.</string>
-    <string name="skill_longdescription_regeneration">Ganho de +%1$d pontos de vida (HP) em cada ronda por nível de habilidade.</string>
-    <string name="skill_longdescription_lower_exploss">Por cada nível de habilidade, reduz a quantidade de experiência perdida por morreres em %1$d %% (percentagem do valor atual de perda de exp, não pontos percentuais do valor de exp). %2$d níveis eliminam todas a perda de experiência devido a morte.</string>
-    <string name="skill_longdescription_magicfinder">Aumenta a probabilidade de encontrar objetos fora do normal em %1$d %% por cada nível de habilidade.</string>
-    <string name="skill_longdescription_resistance_mental">Diminui a probabilidade de ser afetado por encantamentos que incidem sobre a mente em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de montros tais como Atordoar (Dazed) ou Enfraquecer Arma (Weapon Feebleness).</string>
-    <string name="skill_longdescription_resistance_physical_capacity">Diminui a probabilidade de ser afetado por encantamentos que incidem sobre a condição física em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de monstros tais como Cansar (Fatigue).</string>
-    <string name="skill_longdescription_resistance_blood_disorder">Diminui a probabilidade de ser afetado por problemas sanguíneos em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de monstros tais como Envenenar (Poison) ou Feridas sangrando (bleeding wounds).</string>
+	<string name="skill_longdescription_weapon_chance">Aumenta a probabilidade de ataque em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_weapon_dmg">Aumenta o dano mínimo e máximo em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_barter">Por cada nível de habilidade, diminui a penalização monetária de compra e venda em %1$d pontos percentuais.</string>
+	<string name="skill_longdescription_dodge">Aumenta a probabilidade de bloqueio em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_barkskin">Aumenta a resistência a danos em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_more_criticals">Aumenta todas as probabilidades de ataque crítico dadas por equipamento em %1$d %% por cada nível de habilidade (percentagem do valor da probabilidade de ataque crítico existente, não pontos percentuais).</string>
+	<string name="skill_longdescription_better_criticals">Aumenta todos os multiplicadores de ataque crítico dados por equipamento em %1$d %% por cada nível de habilidade.</string>
+	<string name="skill_longdescription_speed">Aumenta o máximo de pontos de ação (AP) em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_coinfinder">Aumenta a probabilidade de encontrar moedas na morte de monstros em %1$d %%, e aumenta a quantidade de moedas por cada morte em %2$d %% por cada nível de habilidade (até ao valor máximo que cada monstro possa dar).</string>
+	<string name="skill_longdescription_more_exp">Aumenta a quantidade de exp dada por derrotar monstros em %1$d %% por cada nível de habilidade.</string>
+	<string name="skill_longdescription_cleave">Dá +%1$d pontos de acção (AP) em cada morte por cada nível de habilidade.</string>
+	<string name="skill_longdescription_eater">Dá +%1$d pontos de vida (HP) em cada morte por cada nível de habilidade.</string>
+	<string name="skill_longdescription_fortitude">Em cada subida de nível seguinte, o máximo de pontos de vida (HP) será aumentado em %1$d por cada nível de habilidade. Isto não é aplicado retroativamente, apenas as subidas de nível seguintes serão afetadas.</string>
+	<string name="skill_longdescription_evasion">Por cada nível de habilidade, reduz a probabilidade de tentativas de fuga falhadas em %1$d %% e a probabilidade de um monstro numa posição adjacente ataque em %2$d %%.</string>
+	<string name="skill_longdescription_regeneration">Ganho de +%1$d pontos de vida (HP) em cada ronda por nível de habilidade.</string>
+	<string name="skill_longdescription_lower_exploss">Por cada nível de habilidade, reduz a quantidade de experiência perdida por morreres em %1$d %% (percentagem do valor atual de perda de exp, não pontos percentuais do valor de exp). %2$d níveis eliminam todas a perda de experiência devido a morte.</string>
+	<string name="skill_longdescription_magicfinder">Aumenta a probabilidade de encontrar objetos fora do normal em %1$d %% por cada nível de habilidade.</string>
+	<string name="skill_longdescription_resistance_mental">Diminui a probabilidade de ser afetado por encantamentos que incidem sobre a mente em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de montros tais como Atordoar (Dazed) ou Enfraquecer Arma (Weapon Feebleness).</string>
+	<string name="skill_longdescription_resistance_physical_capacity">Diminui a probabilidade de ser afetado por encantamentos que incidem sobre a condição física em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de monstros tais como Cansar (Fatigue).</string>
+	<string name="skill_longdescription_resistance_blood_disorder">Diminui a probabilidade de ser afetado por problemas sanguíneos em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de monstros tais como Envenenar (Poison) ou Feridas sangrando (bleeding wounds).</string>
 
-    <string name="skillinfo_action_levelup">Subida de nível</string>
-    <string name="skill_current_level">Nível atual: %1$d</string>
-    <string name="skill_current_level_with_maximum">Nível atual: %1$d / %2$d</string>
-    <string name="skill_prerequisite_other_skill">Para subir o nível desta habilidade tem que ter, pelo menos, o nível %1$d da habilidade %2$s.</string>
-    <string name="skill_prerequisite_level">Para subir o nível desta habilidade tem que ter, no mínimo, o nível %1$d de experiência.</string>
-    <string name="skill_prerequisite_stat">Para subir o nível desta habilidade tem que ter, pelo menos, %1$d %2$s (estatísticas base).</string>
-    <string name="skill_number_of_increases_one">Podes selecionar uma habilidade para aumentar.</string>
-    <string name="skill_number_of_increases_several">Podes selecionar %1$d habilidades para aumentar.</string>
-    <string name="levelup_adds_new_skillpoint">Este nível também dá um novo ponto de habilidade para gastar!</string>
+	<string name="skillinfo_action_levelup">Subida de nível</string>
+	<string name="skill_current_level">Nível atual: %1$d</string>
+	<string name="skill_current_level_with_maximum">Nível atual: %1$d / %2$d</string>
+	<string name="skill_prerequisite_other_skill">Para subir o nível desta habilidade tem que ter, pelo menos, o nível %1$d da habilidade %2$s.</string>
+	<string name="skill_prerequisite_level">Para subir o nível desta habilidade tem que ter, no mínimo, o nível %1$d de experiência.</string>
+	<string name="skill_prerequisite_stat">Para subir o nível desta habilidade tem que ter, pelo menos, %1$d %2$s (estatísticas base).</string>
+	<string name="skill_number_of_increases_one">Podes selecionar uma habilidade para aumentar.</string>
+	<string name="skill_number_of_increases_several">Podes selecionar %1$d habilidades para aumentar.</string>
+	<string name="levelup_adds_new_skillpoint">Este nível também dá um novo ponto de habilidade para gastar!</string>
 
 	<string name="loadsave_save_to_new_slot">Criar nova posição para guardar jogo</string>
 	<string name="loadsave_save_overwrite_confirmation_title">Substituir salvamento?</string>
@@ -415,13 +415,13 @@
 	<string name="iteminfo_displaytypes_legendary">Lendário</string>
 	<string name="iteminfo_displaytypes_extraordinary">Extraordinário</string>
 	<string name="iteminfo_displaytypes_rare">Raro</string>
-	
+
 	<string name="actorconditioninfo_category">Categoria do encantamento: %1$s</string>
 	<string name="actorcondition_categories_spiritual">Espiritual</string>
 	<string name="actorcondition_categories_mental">Mental</string>
 	<string name="actorcondition_categories_physical">Capacidade Física</string>
 	<string name="actorcondition_categories_blood">Problema Sanguíneo</string>
-	
+
 	<string name="traitsinfo_base_max_hp">HP Máx.:</string>
 	<string name="traitsinfo_base_max_ap">AP Máx.:</string>
 	<string name="menu_save_saving_not_allowed_in_combat">Não é possível guardar o jogo durante um combate.</string>
@@ -433,43 +433,43 @@
 	<!-- Added in v0.6.11 -->
 
 	<string name="skill_title_shadow_bless">Bênção negra das Sombras</string>
-    <string name="skill_shortdescription_shadow_bless">Resistência contra todos os tipos de condições</string>
-    <string name="skill_longdescription_shadow_bless">Reduz a chance de ser afligido por todos os tipos de condições por %1$d %%. Isso inclui as condições causadas por ataque de monstros tas como envenenamento, atordoamento ou fadiga.</string>
+	<string name="skill_shortdescription_shadow_bless">Resistência contra todos os tipos de condições</string>
+	<string name="skill_longdescription_shadow_bless">Reduz a chance de ser afligido por todos os tipos de condições por %1$d %%. Isso inclui as condições causadas por ataque de monstros tas como envenenamento, atordoamento ou fadiga.</string>
 
-    <string name="inventory_movetop">Move para cima</string>
-    <string name="inventory_movebottom">Move para baixo</string>
-    <string name="actorinfo_immune_criticals">Imune a ataques críticos</string>
-    <string name="traitsinfo_criticalhit_effectivechance">Chance efetiva de ataques críticos:</string>
+	<string name="inventory_movetop">Move para cima</string>
+	<string name="inventory_movebottom">Move para baixo</string>
+	<string name="actorinfo_immune_criticals">Imune a ataques críticos</string>
+	<string name="traitsinfo_criticalhit_effectivechance">Chance efetiva de ataques críticos:</string>
 
-   	<string name="skill_title_crit1">Hemorragia interna</string>
-    <string name="skill_shortdescription_crit1">Chance de hemorragia interna</string>
-    <string name="skill_longdescription_crit1">Para cada ataque crítico, existe uma chance de %1$d %% que o golpe cause a condição de \'hemorragia interna\' no alvo. Hemorragia interna afeta severamente as habilidades de combate do alvo, dificultando novos ataques com sucesso.</string>
-   	<string name="skill_title_crit2">Fratura</string>
-    <string name="skill_shortdescription_crit2">Chance de fratura de ossos</string>
-    <string name="skill_longdescription_crit2">Para cada ataque crítico, existe uma chance de %1$d %% que o golpe cause a condição de \'fratura\' no alvo. Fraturas atetam severamente as habilidades defensivas do alvo, tornando mais difíceis defesas subsequentes.</string>
-    <string name="skill_title_rejuvenation">Remoção de efeitos</string>
-    <string name="skill_shortdescription_rejuvenation">Chance de remoção dos efeitos</string>
-    <string name="skill_longdescription_rejuvenation">A cada rodada (6 seconds), existe uma chance de %1$d %% que uma condição ativa com efeito negativa tenha sua magnitude reduzita. Isso se aplica a todos os tipos de efeito que aftetam o corpo, condições mentais como atordoamento, condições físicas como fadiga e também a disordens sanguíneas, como envenenamento.</string>
-   	<string name="skill_title_taunt">Provocação</string>
-    <string name="skill_shortdescription_taunt">Atacante perde pontos de ação (AP) ao errar</string>
-    <string name="skill_longdescription_taunt">Quando um atacante faz um ataque que erra o alfo, existe uma chance de %1$d %% que o atacante perca %2$d pontos de ação (AP). Isso se aplica a todos os tipos de disputa contra você.</string>
-   	<string name="skill_title_concussion">Concusão</string>
-    <string name="skill_shortdescription_concussion">Chance de concusão</string>
-    <string name="skill_longdescription_concussion">Quando é feito um ataque em um alvo cuja chance de bloqueio (BC) é pelo menos %1$d menor que sua chance de ataque (AC), Existe uma possibilidade de%2$d %% que o golpe irá causar uma contusão no alvo. A contusão irá reduzir severamente a capacidade ofensiva do alvo, tornando-o menos hábil em realizar ataques com sucesso.</string>
+	<string name="skill_title_crit1">Hemorragia interna</string>
+	<string name="skill_shortdescription_crit1">Chance de hemorragia interna</string>
+	<string name="skill_longdescription_crit1">Para cada ataque crítico, existe uma chance de %1$d %% que o golpe cause a condição de \'hemorragia interna\' no alvo. Hemorragia interna afeta severamente as habilidades de combate do alvo, dificultando novos ataques com sucesso.</string>
+	<string name="skill_title_crit2">Fratura</string>
+	<string name="skill_shortdescription_crit2">Chance de fratura de ossos</string>
+	<string name="skill_longdescription_crit2">Para cada ataque crítico, existe uma chance de %1$d %% que o golpe cause a condição de \'fratura\' no alvo. Fraturas atetam severamente as habilidades defensivas do alvo, tornando mais difíceis defesas subsequentes.</string>
+	<string name="skill_title_rejuvenation">Remoção de efeitos</string>
+	<string name="skill_shortdescription_rejuvenation">Chance de remoção dos efeitos</string>
+	<string name="skill_longdescription_rejuvenation">A cada rodada (6 seconds), existe uma chance de %1$d %% que uma condição ativa com efeito negativa tenha sua magnitude reduzita. Isso se aplica a todos os tipos de efeito que aftetam o corpo, condições mentais como atordoamento, condições físicas como fadiga e também a disordens sanguíneas, como envenenamento.</string>
+	<string name="skill_title_taunt">Provocação</string>
+	<string name="skill_shortdescription_taunt">Atacante perde pontos de ação (AP) ao errar</string>
+	<string name="skill_longdescription_taunt">Quando um atacante faz um ataque que erra o alfo, existe uma chance de %1$d %% que o atacante perca %2$d pontos de ação (AP). Isso se aplica a todos os tipos de disputa contra você.</string>
+	<string name="skill_title_concussion">Concusão</string>
+	<string name="skill_shortdescription_concussion">Chance de concusão</string>
+	<string name="skill_longdescription_concussion">Quando é feito um ataque em um alvo cuja chance de bloqueio (BC) é pelo menos %1$d menor que sua chance de ataque (AC), Existe uma possibilidade de%2$d %% que o golpe irá causar uma contusão no alvo. A contusão irá reduzir severamente a capacidade ofensiva do alvo, tornando-o menos hábil em realizar ataques com sucesso.</string>
 
-    <string name="about_button4">Sobre</string>
+	<string name="about_button4">Sobre</string>
 
 
 	<!-- =========================================== -->
 	<!-- Added in v0.6.12 -->
 
-    <string name="preferences_ui_category">Interface</string>
-    <string name="preferences_ui_enable_animations_title">Ativa animações</string>
-    <string name="preferences_ui_enable_animations">Mostra animaçòes para vários elementos da interface, tais como a barra de combate.</string>
-    <string name="menu_button_worldmap">Map</string>
-    <string name="menu_button_worldmap_failed">O mapa não pode ser mostrado.</string>
-    <string name="display_worldmap_not_available">O mapa não pode ser mostrado nesse local.</string>
-    <string name="display_worldmap_title">Mapa</string>
+	<string name="preferences_ui_category">Interface</string>
+	<string name="preferences_ui_enable_animations_title">Ativa animações</string>
+	<string name="preferences_ui_enable_animations">Mostra animaçòes para vários elementos da interface, tais como a barra de combate.</string>
+	<string name="menu_button_worldmap">Map</string>
+	<string name="menu_button_worldmap_failed">O mapa não pode ser mostrado.</string>
+	<string name="display_worldmap_not_available">O mapa não pode ser mostrado nesse local.</string>
+	<string name="display_worldmap_title">Mapa</string>
 
 	<string name="inventory_equip_offhand">Equipar (sem aviso)</string>
 
@@ -507,7 +507,7 @@
 
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
-	
+
 	<string name="localize_resources_from_mo_filename">pt-rBR.mo</string>
 
 </resources>
diff --git a/AndorsTrail/res/values-pt-rBR/strings_about.xml b/AndorsTrail/res/values-pt-rBR/strings_about.xml
index 8ed4083bf..0a9218466 100644
--- a/AndorsTrail/res/values-pt-rBR/strings_about.xml
+++ b/AndorsTrail/res/values-pt-rBR/strings_about.xml
@@ -27,7 +27,7 @@
 <div><b>Ataque</b> - [3AP] *</div>
 <img alt="attacking" src="doubleattackexample.png" />
 <p>* (Equipar itens pode alterar o custo de uso e pontos de ação (AP)</p>
-	
+
 <div><b>Usando itens</b> - [5AP]</div>
 <div><b>Fuga</b> - [6AP]</div>
 
diff --git a/AndorsTrail/res/values-pt/strings.xml b/AndorsTrail/res/values-pt/strings.xml
index ec10b6586..52a11a55f 100644
--- a/AndorsTrail/res/values-pt/strings.xml
+++ b/AndorsTrail/res/values-pt/strings.xml
@@ -3,7 +3,7 @@
 <resources>
 	<string name="app_name">Andor\'s Trail</string>
 	<string name="app_description">Um RPG de fantasia baseado em aventuras</string>
-	
+
 	<string name="exit">Sair</string>
 	<string name="exit_to_menu">Ir para menu</string>
 	<string name="menu_pause">Pausa</string>
@@ -18,17 +18,17 @@
 	<string name="loadsave_selectslot">Escolher posição</string>
 	<string name="loadsave_slot_empty">(vazio)</string>
 	<string name="savegame_currenthero_displayinfo">nível %1$d, %2$d exp, %3$d moedas</string>
-	
+
 	<string name="dialog_loading_message">A carregar recursos...</string>
 	<string name="dialog_loading_failed_title">Falha de Carregamento</string>
 	<string name="dialog_loading_failed_message">O Andor\'s Trail não conseguiu carregar o ficheiro de armazenamento do jogo.\n\n:(\n\nO ficheiro pode estar danificado ou incompleto.</string>
 	<string name="dialog_loading_failed_incorrectversion">O Andor\'s Trail não conseguiu carregar o ficheiro de armazenamento do jogo. Este ficheiro foi criado com uma versão mais recente que a que está a ser utilizada actualmente.</string>
-	
+
 	<string name="dialog_close">Fechar</string>
-	
+
 	<string name="dialog_confirmexit_title">Sair</string>
 	<string name="dialog_confirmexit_message">Tem a certeza que quer sair?</string>
-	
+
 	<string name="dialog_paused_title">Pausa</string>
 	<string name="dialog_paused_message">O jogo está em pausa</string>
 	<string name="dialog_paused_resume">Continuar</string>
@@ -49,13 +49,13 @@
 	<string name="heroinfo_spell">Feitiços</string>
 	<string name="heroinfo_levelup">Subir de nível</string>
 	<string name="heroinfo_level">Nível</string>
-	<string name="heroinfo_totalexperience">Experiência total</string>	
+	<string name="heroinfo_totalexperience">Experiência total</string>
 	<string name="heroinfo_wornequipment">Equipamento em uso</string>
 	<string name="heroinfo_inventory">Inventário</string>
 	<string name="heroinfo_gold">Moedas: %1$d</string>
 	<string name="heroinfo_actionpoints">Ponto de acção (AP):</string>
 	<string name="heroinfo_quests">Aventuras</string>
-	
+
 	<string name="combat_attack">Atacar (%1$d AP)</string>
 	<string name="combat_move">Deslocar (%1$d AP)</string>
 	<string name="combat_use">Usar objecto</string>
@@ -68,7 +68,7 @@
 	<string name="combat_status_ap">AP: %1$d</string>
 	<string name="combat_monsterhealth">HP:</string>
 	<string name="combat_monsteraction">%1$s está a atacar.</string>
-	<!-- <string name="combat_cannotexitcombat">Não podes fugir do combate uma vez que estás cercado por esse lado. Tens de tentar fugir por onde não haja monstros.</string>  -->
+	<!-- <string name="combat_cannotexitcombat">Não podes fugir do combate uma vez que estás cercado por esse lado. Tens de tentar fugir por onde não haja monstros.</string> -->
 	<string name="combat_result_monstermiss">%1$s falha!</string>
 	<string name="combat_result_monsterhit">%1$s acerta-te e perdes %2$d hp!</string>
 	<string name="combat_result_monsterhitcritical">%1$s acerta-te com um golpe crítico e perdes %2$d hp!</string>
@@ -78,7 +78,7 @@
 	<string name="combat_result_herokillsmonster">%1$s morre!</string>
 	<string name="combat_not_enough_ap">Não tens AP suficientes para este turno.</string>
 	<string name="combat_hero_dies">Cais inconsciente mas, por sorte, acordas vivo. Perdeste %1$d de experiência.</string>
-		
+
 	<string name="inventory_info">Informação</string>
 	<string name="inventory_equip">Equipar</string>
 	<string name="inventory_unequip">Desequipar</string>
@@ -97,35 +97,35 @@
 	<string name="dialog_monsterloot_title">Vitória</string>
 	<string name="dialog_monsterloot_message">Sobreviveste o combate. </string>
 	<string name="dialog_monsterloot_gainedexp">Ganhaste %1$d de experiência. </string>
-    
-    <string name="monster_difficulty_veryeasy">Muito fácil</string>
-    <string name="monster_difficulty_easy">Fácil</string>
-    <string name="monster_difficulty_normal">Normal</string>
-    <string name="monster_difficulty_hard">Difícil</string>
-    <string name="monster_difficulty_veryhard">Muito difícil</string>
-    <string name="monster_difficulty_impossible">Impossível</string>
 
-    <string name="actorinfo_class">Classe:</string>
-    <string name="actorinfo_difficulty">Dificuldade:</string>
-    <string name="actorinfo_health">Saúde:</string>
-    <string name="actorinfo_attacksperturn">Ataques/turno:</string>
-    <string name="actorinfo_movesperturn">Deslocação/turno:</string>
-    <string name="actorinfo_attack">Ataque:</string>
-    <string name="actorinfo_criticalhit">Golpe crítico:</string>
-    <string name="actorinfo_defense">Defesa:</string>
-    <string name="actorinfo_movecost">Custo de deslocação (AP):</string>
-    <string name="actorinfo_basetraits">Estatíticas de combate base (sem equipamento nem habilidades)</string>
-    <string name="actorinfo_currenttraits">Estatísticas de combate (actual)</string>
-    
-    <string name="traitsinfo_attack_cost">Custo de ataque (AP):</string>
-    <string name="traitsinfo_attack_chance">Probabilidade de ataque:</string>
-    <string name="traitsinfo_attack_damage">Danos de ataque:</string>
-    <string name="traitsinfo_criticalhit_skill">Probabilidade de golpe crítico:</string>
-    <string name="traitsinfo_criticalhit_multiplier">Multiplicador de golpe crítico:</string>
-    <string name="traitsinfo_defense_chance">Probabilidade de bloqueio:</string>
-    <string name="traitsinfo_defense_damageresist">Resistência a danos:</string>
-    
-	<!-- <string name="key_required">É necessária uma chave específica para passar.</string>  -->
+	<string name="monster_difficulty_veryeasy">Muito fácil</string>
+	<string name="monster_difficulty_easy">Fácil</string>
+	<string name="monster_difficulty_normal">Normal</string>
+	<string name="monster_difficulty_hard">Difícil</string>
+	<string name="monster_difficulty_veryhard">Muito difícil</string>
+	<string name="monster_difficulty_impossible">Impossível</string>
+
+	<string name="actorinfo_class">Classe:</string>
+	<string name="actorinfo_difficulty">Dificuldade:</string>
+	<string name="actorinfo_health">Saúde:</string>
+	<string name="actorinfo_attacksperturn">Ataques/turno:</string>
+	<string name="actorinfo_movesperturn">Deslocação/turno:</string>
+	<string name="actorinfo_attack">Ataque:</string>
+	<string name="actorinfo_criticalhit">Golpe crítico:</string>
+	<string name="actorinfo_defense">Defesa:</string>
+	<string name="actorinfo_movecost">Custo de deslocação (AP):</string>
+	<string name="actorinfo_basetraits">Estatíticas de combate base (sem equipamento nem habilidades)</string>
+	<string name="actorinfo_currenttraits">Estatísticas de combate (actual)</string>
+
+	<string name="traitsinfo_attack_cost">Custo de ataque (AP):</string>
+	<string name="traitsinfo_attack_chance">Probabilidade de ataque:</string>
+	<string name="traitsinfo_attack_damage">Danos de ataque:</string>
+	<string name="traitsinfo_criticalhit_skill">Probabilidade de golpe crítico:</string>
+	<string name="traitsinfo_criticalhit_multiplier">Multiplicador de golpe crítico:</string>
+	<string name="traitsinfo_defense_chance">Probabilidade de bloqueio:</string>
+	<string name="traitsinfo_defense_damageresist">Resistência a danos:</string>
+
+	<!-- <string name="key_required">É necessária uma chave específica para passar.</string> -->
 
 	<string name="iteminfo_category">Categoria: </string>
 	<string name="iteminfo_action_use">Usar</string>
@@ -146,15 +146,15 @@
 	<string name="itemcategory_wearable_ring">Usável (anel)</string>
 	<string name="itemcategory_potion">Poção</string>
 	<string name="itemcategory_other">Outra</string>
-	
+
 	<string name="startscreen_continue">Continuar o jogo actual</string>
 	<string name="startscreen_newgame">Novo jogo</string>
 	<string name="startscreen_newgame_confirm">Perderás o jogo e o personagem actual, tens a certeza que queres iniciar um novo jogo?</string>
 	<string name="startscreen_about">Sobre/ajuda</string>
 	<string name="startscreen_enterheroname">Escreva o nome do herói</string>
 	<string name="startscreen_load">Carregar</string>
-	
-	<!-- <string name="conversation_title">%1$s diz</string>  -->
+
+	<!-- <string name="conversation_title">%1$s diz</string> -->
 	<string name="conversation_rewardexp"> [Ganhaste %1$d de experiência]</string>
 	<string name="conversation_rewardgold"> [Ganhaste %1$d moedas]</string>
 	<string name="conversation_lostgold"> [Perdeste %1$d moedas]</string>
@@ -162,7 +162,7 @@
 	<string name="conversation_rewarditems"> [Ganhaste %1$d objectos]</string>
 	<string name="conversation_next">Seguinte</string>
 	<string name="conversation_leave">Sair</string>
-	
+
 	<string name="shop_buy">Comprar</string>
 	<string name="shop_sell">Vender</string>
 	<string name="shop_infoitem">Informação</string>
@@ -171,7 +171,7 @@
 	<string name="shop_yourgold">As tuas moedas: %1$d</string>
 	<string name="shop_item_bought">%1$s comprados.</string>
 	<string name="shop_item_sold">%1$s vendidos.</string>
-	
+
 	<string name="levelup_title">Aumento de nível</string>
 	<string name="levelup_description">Benvindo ao nível %1$d!</string>
 	<string name="levelup_buttontext">Aumento de nível</string>
@@ -183,7 +183,7 @@
 	<string name="levelup_add_attackdamage_description">Adiciona %1$d ao teu dano de ataque base.</string>
 	<string name="levelup_add_blockchance">Aumentar a probabilidade de bloqueio (+%1$d %%)</string>
 	<string name="levelup_add_blockchance_description">Adiciona %1$d%% à tua probabilidade de bloqueio base.</string>
-	
+
 	<string name="dialog_rest_title">Repouso</string>
 	<string name="dialog_rest_confirm_message">Queres descansar aqui?</string>
 	<string name="dialog_rest_message">Já descansaste e recuperaste a tua saúde.</string>
@@ -203,10 +203,10 @@
 		Para discutir o jogo com outros jogadores, por favor visitem os fóruns de discussão.&lt;br /&gt;
 	</string>
 
-	<!-- 
-		This is the GNU GPL v2 text, originally from 
+	<!--
+		This is the GNU GPL v2 text, originally from
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-		For translation of this text, you might be able to find a version in your language here: 
+		For translation of this text, you might be able to find a version in your language here:
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
 	-->
 	<string name="about_contents3">
@@ -218,7 +218,7 @@
 		&lt;br /&gt;
 		Para acesso ao código-fonte e pedido, por favor visite a página do projecto em &lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
 	</string>
-	
+
 	<string name="dialog_newversion_title">Benvido</string>
 	<string name="dialog_newversion_message">
 		Obrigado pela transferência de Andor\'s Trail!\n\n
@@ -226,8 +226,8 @@
 		Por favor, visite os fóruns de discussão do projecto para entrar em contacto com outros jogadores ou para ajudar a tornar o jogo ainda melhor (ver "sobre").\n
 		\n
 		Muito obrigado por todos os contactos!
-	</string> 
-	
+	</string>
+
 	<string name="questlog_title">Aventuras</string>
 	<string name="questlog_includecompleted_prompt">Selecção das aventuras a mostrar</string>
 	<string name="questlog_includecompleted_hidecompleted">Esconder aventuras terminadas</string>
@@ -236,7 +236,7 @@
 	<string name="questlog_queststatus">Estado: %1$s</string>
 	<string name="questlog_queststatus_inprogress">Em progresso</string>
 	<string name="questlog_queststatus_completed">Terminada</string>
-	
+
 	<string name="preferences_display_category">Apresentação</string>
 	<string name="preferences_display_fullscreen_title">Ecrã completo</string>
 	<string name="preferences_display_fullscreen">Apresenta o jogo no modo de ecrã completo. (Requer reinício)</string>
@@ -258,7 +258,7 @@
 	<string name="preferences_attackspeed_fast">Rápida</string>
 	<string name="preferences_attackspeed_normal">Normal</string>
 	<string name="preferences_attackspeed_slow">Lenta</string>
-	
+
 	<string name="preferences_movement_category">Deslocação</string>
 	<string name="preferences_movementmethod_title">Método de deslocação</string>
 	<string name="preferences_movementmethod">Tipo de deslocação e tratamento de obstáculos.</string>
@@ -280,39 +280,39 @@
 	<string name="iteminfo_effect_works_when_killing_target">Com cada morte</string>
 	<string name="iteminfo_effect_works_when_used">Quando usado</string>
 	<string name="iteminfo_effect_works_when_equipped">Quando equipado</string>
-	
+
 	<string name="iteminfo_effect_decrease_current_hp">Suga %1$s HP</string>
 	<string name="iteminfo_effect_increase_current_hp">Repõe %1$s HP</string>
 	<string name="iteminfo_effect_decrease_current_ap">Suga %1$s AP</string>
 	<string name="iteminfo_effect_increase_current_ap">Repõe %1$s AP</string>
-	
+
 	<string name="iteminfo_effect_increase_max_hp">Aumenta HP máx. +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_hp">Diminui HP máx. em %1$d</string>
 	<string name="iteminfo_effect_increase_max_ap">Aumenta AP máx. +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_ap">Diminui AP máx. em %1$d</string>
 	<string name="iteminfo_effect_increase_movecost">Penalização no custo de deslocação em +%1$d AP</string>
 	<string name="iteminfo_effect_decrease_movecost">Diminui o custo de deslocação em %1$d AP</string>
-	
+
 	<string name="preferences_display_scaling_factor_title">Factor de ampliação</string>
 	<string name="preferences_display_scaling_factor">Faz com que tudo se veja maior.</string>
 	<string name="preferences_display_scaling_factor_normal">Tamanho normal</string>
 	<string name="preferences_display_scaling_factor_50_percent_larger">1.5x o tamanho</string>
 	<string name="preferences_display_scaling_factor_double">Dobro do tamanho</string>
-	
+
 	<string name="inventory_assign">Atribuir posição rápida</string>
 	<string name="inventory_assign_slot1">Posição 1</string>
 	<string name="inventory_assign_slot2">Posição 2</string>
 	<string name="inventory_assign_slot3">posição 3</string>
 	<string name="inventory_unassign">Remover atribuição de posição rápida</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.6.10 -->
-	
+
 	<string name="preferences_movement_dpad_position_title">D-pad virtual</string>
 	<string name="preferences_movement_dpad_position">Permite que a deslocação seja feita através de um controlo direccional (d-pad) virtual no écrã</string>
 	<string name="preferences_movement_dpad_minimizeable_title">D-pad minimizável</string>
 	<string name="preferences_movement_dpad_minimizeable">Se o d-pad estiver activo, esta opção permite minimizar o d-pad ao ser premido no centro.</string>
-	
+
 	<string name="preferences_movement_dpad_positions_disabled">Inactivo</string>
 	<string name="preferences_movement_dpad_positions_lower_right">Canto inferior direito</string>
 	<string name="preferences_movement_dpad_positions_lower_left">Canto inferiro esquerdo</string>
@@ -322,7 +322,7 @@
 	<string name="preferences_movement_dpad_positions_upper_left">Canto superior esquerdo</string>
 	<string name="preferences_movement_dpad_positions_upper_right">Canto superior direito</string>
 	<string name="preferences_movement_dpad_positions_center_top">Cima</string>
-	
+
 	<string name="actorconditioninfo_constant_effect">Efeito constante</string>
 	<string name="actorconditioninfo_effect_every_round">Todos os turnos</string>
 	<string name="actorconditioninfo_effect_every_full_round">Todos os turnos completos</string>
@@ -331,106 +331,106 @@
 	<string name="bulkselection_select_all">Todos</string>
 	<string name="bulkselection_sell_confirmation_title">Tens a certeza?</string>
 	<string name="bulkselection_sell_confirmation">Tens a certeza que queres vender %1$s? Este objecto é %2$s e poderás não o conseguir recuperar.</string>
-	
-    <string name="skill_title_weapon_chance">Precisão de Arma</string>
-    <string name="skill_title_weapon_dmg">Golpe Forte</string>
-    <string name="skill_title_barter">Mercador</string>
-    <string name="skill_title_dodge">Esquivar</string>
-    <string name="skill_title_barkskin">Pele Espessa</string>
-    <string name="skill_title_more_criticals">Mais Ataques Críticos</string>
-    <string name="skill_title_better_criticals">Melhores Ataques Críticos</string>
-    <string name="skill_title_speed">Velocidade de Combate</string>
-    <string name="skill_title_coinfinder">Caçador de Tesouros</string>
-    <string name="skill_title_more_exp">Aprendizagem Rápida</string>
-    <string name="skill_title_cleave">Rasgar</string>
-    <string name="skill_title_eater">Comedor de Corpos</string>
-    <string name="skill_title_fortitude">Força Aumentada</string>
-    <string name="skill_title_evasion">Evasão</string>
-    <string name="skill_title_regeneration">Regeneração</string>
-    <string name="skill_title_lower_exploss">Controlo de Falhas</string>
-    <string name="skill_title_magicfinder">Descobridor de Magia</string>
-    <string name="skill_title_resistance_mental">Mente Forte</string>
-    <string name="skill_title_resistance_physical_capacity">Corpo Resistente</string>
-    <string name="skill_title_resistance_blood_disorder">Sangue Puro</string>
-    
-    <string name="skill_shortdescription_weapon_chance">Aumento de probabilidade de ataque</string>
-    <string name="skill_shortdescription_weapon_dmg">Aumento de danos em ataque</string>
-    <string name="skill_shortdescription_barter">Melhores preços</string>
-    <string name="skill_shortdescription_dodge">Aumento de probabilidade de bloqueio</string>
-    <string name="skill_shortdescription_barkskin">Resistência a danos</string>
-    <string name="skill_shortdescription_more_criticals">Aumento de probabilidade de ataques críticos</string>
-    <string name="skill_shortdescription_better_criticals">Aumento de danos em ataques críticos</string>
-    <string name="skill_shortdescription_speed">Aumento do máximo de pontos de acção</string>
-    <string name="skill_shortdescription_coinfinder">Maior probabilidade de encontrar moedas</string>
-    <string name="skill_shortdescription_more_exp">Mais experiência com morte de monstros</string>
-    <string name="skill_shortdescription_cleave">Recupera pontos de acção com cada morte</string>
-    <string name="skill_shortdescription_eater">Recupera pontos de saúde com cada morte</string>
-    <string name="skill_shortdescription_fortitude">Ganho de saúde em cada subida de nível</string>
-    <string name="skill_shortdescription_evasion">Aumento da probabilidade de fuga</string>
-    <string name="skill_shortdescription_regeneration">Ganho de saúde em cada turno</string>
-    <string name="skill_shortdescription_lower_exploss">Diminuição da quantidade de pontos de experiência perdidos ao morrer</string>
-    <string name="skill_shortdescription_magicfinder">Aumento da probabilidade de encontrar objectos mágicos</string>
-    <string name="skill_shortdescription_resistance_mental">Resistência contra encantamentos que incidem sobre a mente</string>
-    <string name="skill_shortdescription_resistance_physical_capacity">Resistência contra encantamentos que incidem sobre a capacidade física</string>
-    <string name="skill_shortdescription_resistance_blood_disorder">Resistência contra doenças do sangue</string>
-    
-    <string name="skill_longdescription_weapon_chance">Aumenta a probabilidade de ataque em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_weapon_dmg">Aumenta o dano mínimo e máximo em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_barter">Por cada nível de habilidade, diminui a penalização monetária de compra e venda em %1$d pontos percentuais.</string>
-    <string name="skill_longdescription_dodge">Aumenta a probabilidade de bloqueio em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_barkskin">Aumenta a resistência a danos em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_more_criticals">Aumenta todas as probabilidades de ataque crítico dadas por equipamento em %1$d %% por cada nível de habilidade (percentagem do valor da probabilidade de ataque crítico existente, não pontos percentuais).</string>
-    <string name="skill_longdescription_better_criticals">Aumenta todos os multiplicadores de ataque crítico dados por equipamento em %1$d %% por cada nível de habilidade.</string>
-    <string name="skill_longdescription_speed">Aumenta o máximo de pontos de acção (AP) em %1$d por cada nível de habilidade.</string>
-    <string name="skill_longdescription_coinfinder">Aumenta a probabilidade de encontrar moedas na morte de monstros em %1$d %%, e aumenta a quantidade de moedas por cada morte em %2$d %% por cada nível de habilidade (até ao valor máximo que cada monstro possa dar).</string>
-    <string name="skill_longdescription_more_exp">Aumenta a quantidade de exp dada por derrotares monstros em %1$d %% por cada nível de habilidade.</string>
-    <string name="skill_longdescription_cleave">Dá +%1$d pontos de acção (AP) em cada morte por cada nível de habilidade.</string>
-    <string name="skill_longdescription_eater">Dá +%1$d pontos de vida (HP) em cada morte por cada nível de habilidade.</string>
-    <string name="skill_longdescription_fortitude">Em cada subida de nível seguinte, o máximo de pontos de vida (HP) será aumentado em %1$d por cada nível de habilidade. Isto não é aplicado retroactivamente, apenas as subidas de nível seguintes serão afectadas.</string>
-    <string name="skill_longdescription_evasion">Por cada nível de habilidade, reduz a probabilidade de tentativas de fuga falhadas em %1$d %% e a probabilidade de um monstro numa posição adjacente ataque em %2$d %%.</string>
-    <string name="skill_longdescription_regeneration">Ganho de +%1$d pontos de vida (HP) em cada ronda por nível de habilidade.</string>
-    <string name="skill_longdescription_lower_exploss">Por cada nível de habilidade, reduz a quantidade de experiência perdida por morreres em %1$d %% (percentagem do valor actual de perda de exp, não pontos percentuais do valor de exp). %2$d níveis eliminam todas a perda de experiência devido a morreres.</string>
-    <string name="skill_longdescription_magicfinder">Aumenta a probabilidade de encontrar objectos fora do normal em %1$d %% por cada nível de habilidade.</string>
-    <string name="skill_longdescription_resistance_mental">Diminui a probabilidade de ser afectado por encantamentos que incidem sobre a mente em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de montros tais como Atordoar (Dazed) ou Enfraquecer Arma (Weapon Feebleness).</string>
-    <string name="skill_longdescription_resistance_physical_capacity">Diminui a probabilidade de ser afectado por encantamentos que incidem sobre a condição física em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de monstros tais como Cansar (Fatigue).</string>
-    <string name="skill_longdescription_resistance_blood_disorder">Diminui a probabilidade de ser afectado por problemas sanguíneos em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de monstros tais como Envenenar (Poison) ou Feridas Abertas (bleeding wounds).</string>
-    
-    <string name="skillinfo_action_levelup">Subida de nível</string>
-    <string name="skill_current_level">Nível actual: %1$d</string>
-    <string name="skill_current_level_with_maximum">Nível actual: %1$d / %2$d</string>
-    <string name="skill_prerequisite_other_skill">Para subir o nível desta habilidade tens de ter, pelo menos, o nível %1$d da habilidade %2$s.</string>
-    <string name="skill_prerequisite_level">Para subir o nível desta habilidade tens de ter, no mínimo, o nível %1$d de experiência.</string>
-    <string name="skill_prerequisite_stat">Para subir o nível desta habilidade tens de ter, pelo menos, %1$d %2$s (estatísticas base).</string>
-    <string name="skill_number_of_increases_one">Podes seleccionar uma habilidade para aumentar.</string>
-    <string name="skill_number_of_increases_several">Podes seleccionar %1$d habilidades para aumentar.</string>
-    <string name="levelup_adds_new_skillpoint">Este nível também te dá um novo ponto de habilidade para gastar!</string>
+
+	<string name="skill_title_weapon_chance">Precisão de Arma</string>
+	<string name="skill_title_weapon_dmg">Golpe Forte</string>
+	<string name="skill_title_barter">Mercador</string>
+	<string name="skill_title_dodge">Esquivar</string>
+	<string name="skill_title_barkskin">Pele Espessa</string>
+	<string name="skill_title_more_criticals">Mais Ataques Críticos</string>
+	<string name="skill_title_better_criticals">Melhores Ataques Críticos</string>
+	<string name="skill_title_speed">Velocidade de Combate</string>
+	<string name="skill_title_coinfinder">Caçador de Tesouros</string>
+	<string name="skill_title_more_exp">Aprendizagem Rápida</string>
+	<string name="skill_title_cleave">Rasgar</string>
+	<string name="skill_title_eater">Comedor de Corpos</string>
+	<string name="skill_title_fortitude">Força Aumentada</string>
+	<string name="skill_title_evasion">Evasão</string>
+	<string name="skill_title_regeneration">Regeneração</string>
+	<string name="skill_title_lower_exploss">Controlo de Falhas</string>
+	<string name="skill_title_magicfinder">Descobridor de Magia</string>
+	<string name="skill_title_resistance_mental">Mente Forte</string>
+	<string name="skill_title_resistance_physical_capacity">Corpo Resistente</string>
+	<string name="skill_title_resistance_blood_disorder">Sangue Puro</string>
+
+	<string name="skill_shortdescription_weapon_chance">Aumento de probabilidade de ataque</string>
+	<string name="skill_shortdescription_weapon_dmg">Aumento de danos em ataque</string>
+	<string name="skill_shortdescription_barter">Melhores preços</string>
+	<string name="skill_shortdescription_dodge">Aumento de probabilidade de bloqueio</string>
+	<string name="skill_shortdescription_barkskin">Resistência a danos</string>
+	<string name="skill_shortdescription_more_criticals">Aumento de probabilidade de ataques críticos</string>
+	<string name="skill_shortdescription_better_criticals">Aumento de danos em ataques críticos</string>
+	<string name="skill_shortdescription_speed">Aumento do máximo de pontos de acção</string>
+	<string name="skill_shortdescription_coinfinder">Maior probabilidade de encontrar moedas</string>
+	<string name="skill_shortdescription_more_exp">Mais experiência com morte de monstros</string>
+	<string name="skill_shortdescription_cleave">Recupera pontos de acção com cada morte</string>
+	<string name="skill_shortdescription_eater">Recupera pontos de saúde com cada morte</string>
+	<string name="skill_shortdescription_fortitude">Ganho de saúde em cada subida de nível</string>
+	<string name="skill_shortdescription_evasion">Aumento da probabilidade de fuga</string>
+	<string name="skill_shortdescription_regeneration">Ganho de saúde em cada turno</string>
+	<string name="skill_shortdescription_lower_exploss">Diminuição da quantidade de pontos de experiência perdidos ao morrer</string>
+	<string name="skill_shortdescription_magicfinder">Aumento da probabilidade de encontrar objectos mágicos</string>
+	<string name="skill_shortdescription_resistance_mental">Resistência contra encantamentos que incidem sobre a mente</string>
+	<string name="skill_shortdescription_resistance_physical_capacity">Resistência contra encantamentos que incidem sobre a capacidade física</string>
+	<string name="skill_shortdescription_resistance_blood_disorder">Resistência contra doenças do sangue</string>
+
+	<string name="skill_longdescription_weapon_chance">Aumenta a probabilidade de ataque em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_weapon_dmg">Aumenta o dano mínimo e máximo em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_barter">Por cada nível de habilidade, diminui a penalização monetária de compra e venda em %1$d pontos percentuais.</string>
+	<string name="skill_longdescription_dodge">Aumenta a probabilidade de bloqueio em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_barkskin">Aumenta a resistência a danos em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_more_criticals">Aumenta todas as probabilidades de ataque crítico dadas por equipamento em %1$d %% por cada nível de habilidade (percentagem do valor da probabilidade de ataque crítico existente, não pontos percentuais).</string>
+	<string name="skill_longdescription_better_criticals">Aumenta todos os multiplicadores de ataque crítico dados por equipamento em %1$d %% por cada nível de habilidade.</string>
+	<string name="skill_longdescription_speed">Aumenta o máximo de pontos de acção (AP) em %1$d por cada nível de habilidade.</string>
+	<string name="skill_longdescription_coinfinder">Aumenta a probabilidade de encontrar moedas na morte de monstros em %1$d %%, e aumenta a quantidade de moedas por cada morte em %2$d %% por cada nível de habilidade (até ao valor máximo que cada monstro possa dar).</string>
+	<string name="skill_longdescription_more_exp">Aumenta a quantidade de exp dada por derrotares monstros em %1$d %% por cada nível de habilidade.</string>
+	<string name="skill_longdescription_cleave">Dá +%1$d pontos de acção (AP) em cada morte por cada nível de habilidade.</string>
+	<string name="skill_longdescription_eater">Dá +%1$d pontos de vida (HP) em cada morte por cada nível de habilidade.</string>
+	<string name="skill_longdescription_fortitude">Em cada subida de nível seguinte, o máximo de pontos de vida (HP) será aumentado em %1$d por cada nível de habilidade. Isto não é aplicado retroactivamente, apenas as subidas de nível seguintes serão afectadas.</string>
+	<string name="skill_longdescription_evasion">Por cada nível de habilidade, reduz a probabilidade de tentativas de fuga falhadas em %1$d %% e a probabilidade de um monstro numa posição adjacente ataque em %2$d %%.</string>
+	<string name="skill_longdescription_regeneration">Ganho de +%1$d pontos de vida (HP) em cada ronda por nível de habilidade.</string>
+	<string name="skill_longdescription_lower_exploss">Por cada nível de habilidade, reduz a quantidade de experiência perdida por morreres em %1$d %% (percentagem do valor actual de perda de exp, não pontos percentuais do valor de exp). %2$d níveis eliminam todas a perda de experiência devido a morreres.</string>
+	<string name="skill_longdescription_magicfinder">Aumenta a probabilidade de encontrar objectos fora do normal em %1$d %% por cada nível de habilidade.</string>
+	<string name="skill_longdescription_resistance_mental">Diminui a probabilidade de ser afectado por encantamentos que incidem sobre a mente em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de montros tais como Atordoar (Dazed) ou Enfraquecer Arma (Weapon Feebleness).</string>
+	<string name="skill_longdescription_resistance_physical_capacity">Diminui a probabilidade de ser afectado por encantamentos que incidem sobre a condição física em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de monstros tais como Cansar (Fatigue).</string>
+	<string name="skill_longdescription_resistance_blood_disorder">Diminui a probabilidade de ser afectado por problemas sanguíneos em %1$d %% por cada nível de habilidade, até ao máximo de %2$d %%. Isto inclui ataques de monstros tais como Envenenar (Poison) ou Feridas Abertas (bleeding wounds).</string>
+
+	<string name="skillinfo_action_levelup">Subida de nível</string>
+	<string name="skill_current_level">Nível actual: %1$d</string>
+	<string name="skill_current_level_with_maximum">Nível actual: %1$d / %2$d</string>
+	<string name="skill_prerequisite_other_skill">Para subir o nível desta habilidade tens de ter, pelo menos, o nível %1$d da habilidade %2$s.</string>
+	<string name="skill_prerequisite_level">Para subir o nível desta habilidade tens de ter, no mínimo, o nível %1$d de experiência.</string>
+	<string name="skill_prerequisite_stat">Para subir o nível desta habilidade tens de ter, pelo menos, %1$d %2$s (estatísticas base).</string>
+	<string name="skill_number_of_increases_one">Podes seleccionar uma habilidade para aumentar.</string>
+	<string name="skill_number_of_increases_several">Podes seleccionar %1$d habilidades para aumentar.</string>
+	<string name="levelup_adds_new_skillpoint">Este nível também te dá um novo ponto de habilidade para gastar!</string>
 
 	<string name="loadsave_save_to_new_slot">Criar nova posição para guardar jogo</string>
 	<string name="loadsave_save_overwrite_confirmation_title">Substituir salvaguarda?</string>
-	<string name="loadsave_save_overwrite_confirmation">Esta salvaguarda contém um nome de jogador diferente (%1$s) do nome do jogador actual (%2$s). Tens a certeza que queres substituir esta salvaguarda?</string> 
-	
+	<string name="loadsave_save_overwrite_confirmation">Esta salvaguarda contém um nome de jogador diferente (%1$s) do nome do jogador actual (%2$s). Tens a certeza que queres substituir esta salvaguarda?</string>
+
 	<string name="iteminfo_displaytypes_ordinary">Ordinário</string>
 	<string name="iteminfo_displaytypes_quest">Objecto de aventura</string>
 	<string name="iteminfo_displaytypes_legendary">Lendário</string>
 	<string name="iteminfo_displaytypes_extraordinary">Extraordinário</string>
 	<string name="iteminfo_displaytypes_rare">Raro</string>
-	
+
 	<string name="actorconditioninfo_category">Categoria do encantamento: %1$s</string>
 	<string name="actorcondition_categories_spiritual">Espiritual</string>
 	<string name="actorcondition_categories_mental">Mental</string>
 	<string name="actorcondition_categories_physical">Capacidade Física</string>
 	<string name="actorcondition_categories_blood">Problema Sanguíneo</string>
-	
+
 	<string name="traitsinfo_base_max_hp">HP Máx.:</string>
 	<string name="traitsinfo_base_max_ap">AP Máx.:</string>
 	<string name="menu_save_saving_not_allowed_in_combat">Não é possível guardar o jogo durante um combate.</string>
-	
+
 	<string name="preferences_optimized_drawing_title">Optimized drawing</string>
 	<string name="preferences_optimized_drawing">Desactiva esta opção caso apareçam artefactos gráficos. Ao activar esta opção apenas serão redesenhados no écrã os blocos alterados em cada fotograma.</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
-	
+
 	<string name="localize_resources_from_mo_filename">pt.mo</string>
 
 </resources>
diff --git a/AndorsTrail/res/values-ru/strings.xml b/AndorsTrail/res/values-ru/strings.xml
index f1e0e7e7b..4537e7595 100644
--- a/AndorsTrail/res/values-ru/strings.xml
+++ b/AndorsTrail/res/values-ru/strings.xml
@@ -3,7 +3,7 @@
 <resources>
 	<string name="app_name">След Эндора</string>
 	<string name="app_description">Квестово-фэнтезийная RPG</string>
-	
+
 	<string name="exit">Выйти</string>
 	<string name="exit_to_menu">В меню</string>
 	<string name="menu_pause">Пауза</string>
@@ -18,17 +18,17 @@
 	<string name="loadsave_selectslot">Выбери слот</string>
 	<string name="loadsave_slot_empty">(пустой)</string>
 	<string name="savegame_currenthero_displayinfo">уровень: %1$d, опыт: %2$d, золото: %3$d</string>
-	
+
 	<string name="dialog_loading_message">Загрузка ресурсов...</string>
 	<string name="dialog_loading_failed_title">Ошибка загрузки</string>
 	<string name="dialog_loading_failed_message">Невозможно загрузить файл сохранения.\n\n:(\n\nВозможно файл испорчен или удален.</string>
 	<string name="dialog_loading_failed_incorrectversion">Невозможно загрузить файл сохранения. Данный файл создан более новой версией игры, чем запущенная в данный момент.</string>
-	
+
 	<string name="dialog_close">Закрыть</string>
-	
+
 	<string name="dialog_confirmexit_title">Выход</string>
 	<string name="dialog_confirmexit_message">Вы точно хотите выйти?</string>
-	
+
 	<string name="dialog_paused_title">Пауза</string>
 	<string name="dialog_paused_message">Игра на паузе</string>
 	<string name="dialog_paused_resume">Продолжить</string>
@@ -49,13 +49,13 @@
 	<string name="heroinfo_spell">Заклинания</string>
 	<string name="heroinfo_levelup">Уровень повышен</string>
 	<string name="heroinfo_level">Уровень</string>
-	<string name="heroinfo_totalexperience">Всего опыта</string>	
+	<string name="heroinfo_totalexperience">Всего опыта</string>
 	<string name="heroinfo_wornequipment">Экипировка</string>
 	<string name="heroinfo_inventory">Инвентарь</string>
 	<string name="heroinfo_gold">Золото: %1$d</string>
 	<string name="heroinfo_actionpoints">Очки действия (ОД):</string>
 	<string name="heroinfo_quests">Задания</string>
-	
+
 	<string name="combat_attack">Атака (%1$d ОД)</string>
 	<string name="combat_move">Движение (%1$d ОД)</string>
 	<string name="combat_use">Вещь</string>
@@ -68,7 +68,7 @@
 	<string name="combat_status_ap">ОД: %1$d</string>
 	<string name="combat_monsterhealth">ОЗ:</string>
 	<string name="combat_monsteraction">%1$s атакует.</string>
-	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string>  -->
+	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string> -->
 	<string name="combat_result_monstermiss">%1$s промахивается!</string>
 	<string name="combat_result_monsterhit">%1$s нанес вам повреждение на %2$d ОЗ!</string>
 	<string name="combat_result_monsterhitcritical">%1$s наносит критический удар на %2$d ОЗ!</string>
@@ -78,7 +78,7 @@
 	<string name="combat_result_herokillsmonster">%1$s убит!</string>
 	<string name="combat_not_enough_ap">Не хватает ОД для этого действия.</string>
 	<string name="combat_hero_dies">Вы падаете без сознания, но к счастью остались живы. Вы потеряли %1$d опыта.</string>
-		
+
 	<string name="inventory_info">Инфо</string>
 	<string name="inventory_equip">Надеть</string>
 	<string name="inventory_unequip">Снять</string>
@@ -97,35 +97,35 @@
 	<string name="dialog_monsterloot_title">Победа</string>
 	<string name="dialog_monsterloot_message">Вы выиграли бой. </string>
 	<string name="dialog_monsterloot_gainedexp">Вы получили %1$d опыта. </string>
-    
-    <string name="monster_difficulty_veryeasy">Очень легко</string>
-    <string name="monster_difficulty_easy">Легко</string>
-    <string name="monster_difficulty_normal">Нормально</string>
-    <string name="monster_difficulty_hard">Сложно</string>
-    <string name="monster_difficulty_veryhard">Очень сложно</string>
-    <string name="monster_difficulty_impossible">Невозможно</string>
 
-    <string name="actorinfo_class">Класс:</string>
-    <string name="actorinfo_difficulty">Сложность:</string>
-    <string name="actorinfo_health">Здоровье:</string>
-    <string name="actorinfo_attacksperturn">Атак за ход:</string>
-    <string name="actorinfo_movesperturn">Движений за ход:</string>
-    <string name="actorinfo_attack">Атака:</string>
-    <string name="actorinfo_criticalhit">Критический удар:</string>
-    <string name="actorinfo_defense">Защита:</string>
-    <string name="actorinfo_movecost">Цена движения (ОД):</string>
-    <string name="actorinfo_basetraits">Боевая статистика без экипировки (базовая)</string>
-    <string name="actorinfo_currenttraits">Боевая статистика в экипировке (текущая)</string>
-    
-    <string name="traitsinfo_attack_cost">Цена атаки (ОД):</string>
-    <string name="traitsinfo_attack_chance">Шанс атаки:</string>
-    <string name="traitsinfo_attack_damage">Сила атаки:</string>
-    <string name="traitsinfo_criticalhit_skill">Шанс критического удара:</string>
-    <string name="traitsinfo_criticalhit_multiplier">Критический умножитель:</string>
-    <string name="traitsinfo_defense_chance">Шанс блока:</string>
-    <string name="traitsinfo_defense_damageresist">Сопротивление урону:</string>
+	<string name="monster_difficulty_veryeasy">Очень легко</string>
+	<string name="monster_difficulty_easy">Легко</string>
+	<string name="monster_difficulty_normal">Нормально</string>
+	<string name="monster_difficulty_hard">Сложно</string>
+	<string name="monster_difficulty_veryhard">Очень сложно</string>
+	<string name="monster_difficulty_impossible">Невозможно</string>
 
-	<!-- <string name="key_required">Специальный ключ требуется для прохода.</string>  -->
+	<string name="actorinfo_class">Класс:</string>
+	<string name="actorinfo_difficulty">Сложность:</string>
+	<string name="actorinfo_health">Здоровье:</string>
+	<string name="actorinfo_attacksperturn">Атак за ход:</string>
+	<string name="actorinfo_movesperturn">Движений за ход:</string>
+	<string name="actorinfo_attack">Атака:</string>
+	<string name="actorinfo_criticalhit">Критический удар:</string>
+	<string name="actorinfo_defense">Защита:</string>
+	<string name="actorinfo_movecost">Цена движения (ОД):</string>
+	<string name="actorinfo_basetraits">Боевая статистика без экипировки (базовая)</string>
+	<string name="actorinfo_currenttraits">Боевая статистика в экипировке (текущая)</string>
+
+	<string name="traitsinfo_attack_cost">Цена атаки (ОД):</string>
+	<string name="traitsinfo_attack_chance">Шанс атаки:</string>
+	<string name="traitsinfo_attack_damage">Сила атаки:</string>
+	<string name="traitsinfo_criticalhit_skill">Шанс критического удара:</string>
+	<string name="traitsinfo_criticalhit_multiplier">Критический умножитель:</string>
+	<string name="traitsinfo_defense_chance">Шанс блока:</string>
+	<string name="traitsinfo_defense_damageresist">Сопротивление урону:</string>
+
+	<!-- <string name="key_required">Специальный ключ требуется для прохода.</string> -->
 
 	<string name="iteminfo_category">Категория: </string>
 	<string name="iteminfo_action_use">Использовать</string>
@@ -154,7 +154,7 @@
 	<string name="startscreen_enterheroname">Введите имя героя</string>
 	<string name="startscreen_load">Загрузить</string>
 
-	<!-- <string name="conversation_title">%1$s сказал</string>  -->
+	<!-- <string name="conversation_title">%1$s сказал</string> -->
 	<string name="conversation_rewardexp"> [Вы получили %1$d опыта]</string>
 	<string name="conversation_rewardgold"> [Вы получили %1$d золота]</string>
 	<string name="conversation_lostgold"> [Вы утратили %1$d золота]</string>
@@ -171,7 +171,7 @@
 	<string name="shop_yourgold">Ваше золото: %1$d</string>
 	<string name="shop_item_bought">%1$s куплен.</string>
 	<string name="shop_item_sold">%1$s продан.</string>
-	
+
 	<string name="levelup_title">Уровень повышен</string>
 	<string name="levelup_description">Добро пожаловать на уровень %1$d!</string>
 	<string name="levelup_buttontext">Новый уровень</string>
@@ -183,7 +183,7 @@
 	<string name="levelup_add_attackdamage_description">Добавить %1$d к базовой силе атаки.</string>
 	<string name="levelup_add_blockchance">Увеличить шанс блока (+%1$d %%)</string>
 	<string name="levelup_add_blockchance_description">Добавить %1$d%% к базовому шансу на блок.</string>
-	
+
 	<string name="dialog_rest_title">Отдых</string>
 	<string name="dialog_rest_confirm_message">Вы хотите отдохнуть здесь?</string>
 	<string name="dialog_rest_message">Вы отдохнули и восстановили свое здоровье полностью.</string>
@@ -192,7 +192,7 @@
 	<string name="about_button2">Авторы</string>
 	<string name="about_button3">Лицензия</string>
 	<string name="about_contents1">
-   		Добро пожаловать в След Эндора, RPG с открытым исходным кодом на Android.&lt;br /&gt;
+		Добро пожаловать в След Эндора, RPG с открытым исходным кодом на Android.&lt;br /&gt;
 		&lt;br /&gt;
 		&lt;a href="http://andorstrail.com/"&gt;Форум игры andorstrail.com для вопросов и обсуждения.&lt;/a&gt;&lt;br /&gt;
 		&lt;br /&gt;
@@ -203,14 +203,14 @@
 		Пожалуйста, посещайте форум, чтобы обсуждать игру с другими игроками.&lt;br /&gt;
 	</string>
 
-	<!-- 
-		This is the GNU GPL v2 text, originally from 
+	<!--
+		This is the GNU GPL v2 text, originally from
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-		For translation of this text, you might be able to find a version in your language here: 
+		For translation of this text, you might be able to find a version in your language here:
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
 	-->
 	<string name="about_contents3">
-   		Это бесплатное приложение; вы можете изменять ее и модифицировать согласно правилам GNU General Public License изданных Free Software Foundation; либо версии 2 лицензии, либо более позней версией.&lt;br /&gt;
+		Это бесплатное приложение; вы можете изменять ее и модифицировать согласно правилам GNU General Public License изданных Free Software Foundation; либо версии 2 лицензии, либо более позней версией.&lt;br /&gt;
 		&lt;br /&gt;
 		Игра создана с надеждой что она будет интересна, но БЕЗ ВСЯКИХ ГАРАНТИЙ; даже без подразумеваемых гарантии ТОВАРНОЙ ПРИГОДНОСТИ или ПРИГОДНОСТИ ДЛЯ ОПРЕДЕЛЕННЫХ ЦЕЛЕЙ. Смотрите GNU General Public License для больших подробностей.&lt;br /&gt;
 		&lt;br /&gt;
@@ -218,16 +218,16 @@
 		&lt;br /&gt;
 		За исходным кодом и пожеланиями, пожалуйста, посетите страницу проекта на &lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
 	</string>
-	
+
 	<string name="dialog_newversion_title">Приветствуем</string>
 	<string name="dialog_newversion_message">
 		Спасибо за загрузку игры След Эндора!\n\n
-		Запомните, игра находится  в СТАДИИ РАЗРАБОТКИ, это означает что не все карты еще закончены.\n
+		Запомните, игра находится в СТАДИИ РАЗРАБОТКИ, это означает что не все карты еще закончены.\n
 		Пожалуйста, посещайте форум проекта, чтобы получить более подробную информацию или внести свой вклад в проект (см. Об игре).\n
-		\n 
+		\n
 		Спасибо за отзывы!
-	</string> 
-	
+	</string>
+
 	<string name="questlog_title">Задания</string>
 	<string name="questlog_includecompleted_prompt">Выберите задания для отображения</string>
 	<string name="questlog_includecompleted_hidecompleted">Спрятать завершенные задания</string>
@@ -236,7 +236,7 @@
 	<string name="questlog_queststatus">Статус: %1$s</string>
 	<string name="questlog_queststatus_inprogress">В процессе</string>
 	<string name="questlog_queststatus_completed">Выполнено</string>
-	
+
 	<string name="preferences_display_category">Показ</string>
 	<string name="preferences_display_fullscreen_title">Весь экран</string>
 	<string name="preferences_display_fullscreen">Показывать игру в полноэкранном режиме (необходим перезапуск).</string>
@@ -258,7 +258,7 @@
 	<string name="preferences_attackspeed_fast">Быстро</string>
 	<string name="preferences_attackspeed_normal">Нормально</string>
 	<string name="preferences_attackspeed_slow">Медленно</string>
-	
+
 	<string name="preferences_movement_category">Движение</string>
 	<string name="preferences_movementmethod_title">Способ движения</string>
 	<string name="preferences_movementmethod">Способ движения и обхода препятствий.</string>
@@ -280,39 +280,39 @@
 	<string name="iteminfo_effect_works_when_killing_target">За каждое убийство</string>
 	<string name="iteminfo_effect_works_when_used">Когда используется</string>
 	<string name="iteminfo_effect_works_when_equipped">Когда надет</string>
-	
+
 	<string name="iteminfo_effect_decrease_current_hp">Лишает %1$s ОЗ</string>
 	<string name="iteminfo_effect_increase_current_hp">Восстанавливает %1$s ОЗ</string>
 	<string name="iteminfo_effect_decrease_current_ap">Лишает %1$s ОД</string>
 	<string name="iteminfo_effect_increase_current_ap">Восстанавливает %1$s ОД</string>
-	
+
 	<string name="iteminfo_effect_increase_max_hp">Поднимает макс. ОЗ +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_hp">Понижает макс. ОЗ на %1$d</string>
 	<string name="iteminfo_effect_increase_max_ap">Поднимает макс. ОД +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_ap">Понижает макс. ОД на %1$d</string>
 	<string name="iteminfo_effect_increase_movecost">Цена движения +%1$d ОД</string>
 	<string name="iteminfo_effect_decrease_movecost">Уменьшает цену движения на %1$d ОД</string>
-	
+
 	<string name="preferences_display_scaling_factor_title">Масштаб</string>
 	<string name="preferences_display_scaling_factor">Сделать все изображения на поле игры крупнее.</string>
 	<string name="preferences_display_scaling_factor_normal">Нормальный размер</string>
 	<string name="preferences_display_scaling_factor_50_percent_larger">Крупнее в 1.5 раза</string>
 	<string name="preferences_display_scaling_factor_double">Двойной размер</string>
-	
+
 	<string name="inventory_assign">Назначить быстрый слот</string>
 	<string name="inventory_assign_slot1">Слот №1</string>
 	<string name="inventory_assign_slot2">Слот №2</string>
 	<string name="inventory_assign_slot3">Слот №3</string>
 	<string name="inventory_unassign">Убрать из быстрого слота</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.6.10 -->
-	
+
 	<string name="preferences_movement_dpad_position_title">Виртуальный джойстик</string>
 	<string name="preferences_movement_dpad_position">Показать на экране виртуальные кнопки для управления движением.</string>
 	<string name="preferences_movement_dpad_minimizeable_title">Минимизировать джойстик</string>
 	<string name="preferences_movement_dpad_minimizeable">Если виртуальный джойстик включен, позволить минимизировать джойстик нажатием на его центр.</string>
-	
+
 	<string name="preferences_movement_dpad_positions_disabled">Выключен</string>
 	<string name="preferences_movement_dpad_positions_lower_right">Правый нижний угол</string>
 	<string name="preferences_movement_dpad_positions_lower_left">Левый нижний угол</string>
@@ -322,7 +322,7 @@
 	<string name="preferences_movement_dpad_positions_upper_left">Левый верхний угол</string>
 	<string name="preferences_movement_dpad_positions_upper_right">Правый верхний угол</string>
 	<string name="preferences_movement_dpad_positions_center_top">Сверху в центре</string>
-	
+
 	<string name="actorconditioninfo_constant_effect">Постоянный эффект</string>
 	<string name="actorconditioninfo_effect_every_round">Каждый ход</string>
 	<string name="actorconditioninfo_effect_every_full_round">Каждый полный ход</string>
@@ -331,182 +331,182 @@
 	<string name="bulkselection_select_all">Всё</string>
 	<string name="bulkselection_sell_confirmation_title">Вы уверены?</string>
 	<string name="bulkselection_sell_confirmation">Вы действительно хотит продать %1$s? Этот предмет %2$s и вы не сможете его вернуть.</string>
-	
-    <string name="skill_title_weapon_chance">Точность удара</string>
-    <string name="skill_title_weapon_dmg">Сила удара</string>
-    <string name="skill_title_barter">Торговец</string>
-    <string name="skill_title_dodge">Финты</string>
-    <string name="skill_title_barkskin">Дубленая кожа</string>
-    <string name="skill_title_more_criticals">Ловкость</string>
-    <string name="skill_title_better_criticals">Жестокость</string>
-    <string name="skill_title_speed">Скорость в бою</string>
-    <string name="skill_title_coinfinder">Охотник за сокровищами</string>
-    <string name="skill_title_more_exp">Способный ученик</string>
-    <string name="skill_title_cleave">Ближний бой</string>
-    <string name="skill_title_eater">Пожиратель трупов</string>
-    <string name="skill_title_fortitude">Выносливость</string>
-    <string name="skill_title_evasion">Трусость</string>
-    <string name="skill_title_regeneration">Регенерация</string>
-    <string name="skill_title_lower_exploss">Неудачник</string>
-    <string name="skill_title_magicfinder">Искатель магии</string>
-    <string name="skill_title_resistance_mental">Сильный разум</string>
-    <string name="skill_title_resistance_physical_capacity">Несокрушимое тело</string>
-    <string name="skill_title_resistance_blood_disorder">Безупречная кровь</string>
-    
-    <string name="skill_shortdescription_weapon_chance">Увеличение шанса атаки</string>
-    <string name="skill_shortdescription_weapon_dmg">Увеличение силы атаки</string>
-    <string name="skill_shortdescription_barter">Хорошие цены при торговле</string>
-    <string name="skill_shortdescription_dodge">Увеличение шанса блока</string>
-    <string name="skill_shortdescription_barkskin">Сопротивление урону</string>
-    <string name="skill_shortdescription_more_criticals">Увеличение шанса критического удара</string>
-    <string name="skill_shortdescription_better_criticals">Увеличение силы критического удара</string>
-    <string name="skill_shortdescription_speed">Увеличение количества очков действия</string>
-    <string name="skill_shortdescription_coinfinder">Высокий шанс найти золото</string>
-    <string name="skill_shortdescription_more_exp">Больше опыта при убийстве монстра</string>
-    <string name="skill_shortdescription_cleave">Восстановление очков действия за каждое убийство</string>
-    <string name="skill_shortdescription_eater">Восстановление очков здоровья за каждое убийство</string>
-    <string name="skill_shortdescription_fortitude">Увеличение здоровья при каждом повышении уровня</string>
-    <string name="skill_shortdescription_evasion">Увеличение шансов при бегстве</string>
-    <string name="skill_shortdescription_regeneration">Восстановление очков здоровья каждый ход</string>
-    <string name="skill_shortdescription_lower_exploss">Уменьшение количества потерянного опыта при смерти героя</string>
-    <string name="skill_shortdescription_magicfinder">Увеличение шансов найти магические предметы</string>
-    <string name="skill_shortdescription_resistance_mental">Устойчивость к психическим воздействиям</string>
-    <string name="skill_shortdescription_resistance_physical_capacity">Устойчивость к физическим воздействиям</string>
-    <string name="skill_shortdescription_resistance_blood_disorder">Устойчивость к воздействиям на кровь</string>
-    
-    <string name="skill_longdescription_weapon_chance">Увеличивает шанс атаки на %1$d на каждый уровень навыка.</string>
-    <string name="skill_longdescription_weapon_dmg">Увеличивает мин. и макс. силу атаки на %1$d на каждый уровень навыка.</string>
-    <string name="skill_longdescription_barter">Уменьшает разницу между ценой покупки или продажи и базовой ценой на %1$d процентов на каждый уровень навыка.</string>
-    <string name="skill_longdescription_dodge">Увеличивает шанс блока на %1$d на каждый уровень навыка.</string>
-    <string name="skill_longdescription_barkskin">Увеличивает сопротивление урону на %1$d на каждый уровень навыка.</string>
-    <string name="skill_longdescription_more_criticals">Увеличивает любой существующий шанс критического удара используемой экипировки на %1$d %% на каждый уровень навыка (процент существующего значения, а не процентных пунктов).</string>
-    <string name="skill_longdescription_better_criticals">Увеличивает любой существующий критического умножитель используемой экипировки на %1$d %% на каждый уровень навыка.</string>
-    <string name="skill_longdescription_speed">Увеличивает колчество очков действия (ОД) на %1$d на каждый уровень навыка.</string>
-    <string name="skill_longdescription_coinfinder">Увеличивает шансы найти золото в останках монстра на %1$d %%, и увеличивает количество найденного золота на %2$d %% на каждый уровень навыка (но не более верхнего лимита на золото для этого монстра).</string>
-    <string name="skill_longdescription_more_exp">Увеличивает количество очков опыта, дающегося за победу монстрами на %1$d %% на каждый уровень навыка.</string>
-    <string name="skill_longdescription_cleave">Дает +%1$d очков действия (ОД) за каждое убийство на каждый уровень навыка.</string>
-    <string name="skill_longdescription_eater">Дает +%1$d очков здоровья (ОД) за каждое убийство на каждый уровень навыка.</string>
-    <string name="skill_longdescription_fortitude">На каждом последующем уровне максимальное количество очков здоровья (ОЗ) будет повышаться на %1$d на каждый уровень навыка. Это не применяется задним числом, только к последующим уровням.</string>
-    <string name="skill_longdescription_evasion">Уменьшает вероятность неудач при попытке бежать %1$d %% и шанс, что ближайший монстр будет атаковать, на %2$d %% на каждый уровень навыка.</string>
-    <string name="skill_longdescription_regeneration">Дает +%1$d очков здоровья (ОЗ) каждый ход на каждый уровень навыка.</string>
-    <string name="skill_longdescription_lower_exploss">Уменьшает потери очков опыта при смерти героя на %1$d %% на каждый уровень навыка (процент существующего значения, а не процентных пунктов). После %2$d уровней навыка исчезают все потери опыта, вызванные смертью.</string>
-    <string name="skill_longdescription_magicfinder">Увеличивает шансы найти неординарные предметы на %1$d %% на каждый уровень навыка.</string>
-    <string name="skill_longdescription_resistance_mental">Снижает шансы пострадать от психических воздействий на %1$d %% на каждый уровень навыка, но не более %2$d %%. К таким воздействиям относятся, например, ошеломление или слабость.</string>
-    <string name="skill_longdescription_resistance_physical_capacity">Снижает шансы пострадать от физических воздействий на %1$d %% на каждый уровень навыка, но не более %2$d %%. К таким воздействиям относится, например, усталость.</string>
-    <string name="skill_longdescription_resistance_blood_disorder">Снижает шансы пострадать от воздействий на кровь на %1$d %% на каждый уровень навыка, но не более %2$d %%. К таким воздействиям относятся, например, яд или кровотечение.</string>
-    
-    <string name="skillinfo_action_levelup">Повышение уровня</string>
-    <string name="skill_current_level">Текущий уровень: %1$d</string>
-    <string name="skill_current_level_with_maximum">Текущий уровень: %1$d / %2$d</string>
-    <string name="skill_prerequisite_other_skill">Чтобы повысить уровень этого навыка вам нужно иметь уровень не менее %1$d навыка %2$s.</string>
-    <string name="skill_prerequisite_level">Чтобы повысить уровень этого навыка вам нужно иметь уровень опыта не менее %1$d.</string>
-    <string name="skill_prerequisite_stat">Чтобы повысить уровень этого навыка вам нужно иметь не менее %1$d %2$s (базовых характеристик).</string>
-    <string name="skill_number_of_increases_one">Вы можете выбрать один навык для увеличения.</string>
-    <string name="skill_number_of_increases_several">Вы можете выбрать %1$d навыков для увеличения.</string>
-    <string name="levelup_adds_new_skillpoint">Этот уровень дает вам очко для увеличения навыков!</string>
+
+	<string name="skill_title_weapon_chance">Точность удара</string>
+	<string name="skill_title_weapon_dmg">Сила удара</string>
+	<string name="skill_title_barter">Торговец</string>
+	<string name="skill_title_dodge">Финты</string>
+	<string name="skill_title_barkskin">Дубленая кожа</string>
+	<string name="skill_title_more_criticals">Ловкость</string>
+	<string name="skill_title_better_criticals">Жестокость</string>
+	<string name="skill_title_speed">Скорость в бою</string>
+	<string name="skill_title_coinfinder">Охотник за сокровищами</string>
+	<string name="skill_title_more_exp">Способный ученик</string>
+	<string name="skill_title_cleave">Ближний бой</string>
+	<string name="skill_title_eater">Пожиратель трупов</string>
+	<string name="skill_title_fortitude">Выносливость</string>
+	<string name="skill_title_evasion">Трусость</string>
+	<string name="skill_title_regeneration">Регенерация</string>
+	<string name="skill_title_lower_exploss">Неудачник</string>
+	<string name="skill_title_magicfinder">Искатель магии</string>
+	<string name="skill_title_resistance_mental">Сильный разум</string>
+	<string name="skill_title_resistance_physical_capacity">Несокрушимое тело</string>
+	<string name="skill_title_resistance_blood_disorder">Безупречная кровь</string>
+
+	<string name="skill_shortdescription_weapon_chance">Увеличение шанса атаки</string>
+	<string name="skill_shortdescription_weapon_dmg">Увеличение силы атаки</string>
+	<string name="skill_shortdescription_barter">Хорошие цены при торговле</string>
+	<string name="skill_shortdescription_dodge">Увеличение шанса блока</string>
+	<string name="skill_shortdescription_barkskin">Сопротивление урону</string>
+	<string name="skill_shortdescription_more_criticals">Увеличение шанса критического удара</string>
+	<string name="skill_shortdescription_better_criticals">Увеличение силы критического удара</string>
+	<string name="skill_shortdescription_speed">Увеличение количества очков действия</string>
+	<string name="skill_shortdescription_coinfinder">Высокий шанс найти золото</string>
+	<string name="skill_shortdescription_more_exp">Больше опыта при убийстве монстра</string>
+	<string name="skill_shortdescription_cleave">Восстановление очков действия за каждое убийство</string>
+	<string name="skill_shortdescription_eater">Восстановление очков здоровья за каждое убийство</string>
+	<string name="skill_shortdescription_fortitude">Увеличение здоровья при каждом повышении уровня</string>
+	<string name="skill_shortdescription_evasion">Увеличение шансов при бегстве</string>
+	<string name="skill_shortdescription_regeneration">Восстановление очков здоровья каждый ход</string>
+	<string name="skill_shortdescription_lower_exploss">Уменьшение количества потерянного опыта при смерти героя</string>
+	<string name="skill_shortdescription_magicfinder">Увеличение шансов найти магические предметы</string>
+	<string name="skill_shortdescription_resistance_mental">Устойчивость к психическим воздействиям</string>
+	<string name="skill_shortdescription_resistance_physical_capacity">Устойчивость к физическим воздействиям</string>
+	<string name="skill_shortdescription_resistance_blood_disorder">Устойчивость к воздействиям на кровь</string>
+
+	<string name="skill_longdescription_weapon_chance">Увеличивает шанс атаки на %1$d на каждый уровень навыка.</string>
+	<string name="skill_longdescription_weapon_dmg">Увеличивает мин. и макс. силу атаки на %1$d на каждый уровень навыка.</string>
+	<string name="skill_longdescription_barter">Уменьшает разницу между ценой покупки или продажи и базовой ценой на %1$d процентов на каждый уровень навыка.</string>
+	<string name="skill_longdescription_dodge">Увеличивает шанс блока на %1$d на каждый уровень навыка.</string>
+	<string name="skill_longdescription_barkskin">Увеличивает сопротивление урону на %1$d на каждый уровень навыка.</string>
+	<string name="skill_longdescription_more_criticals">Увеличивает любой существующий шанс критического удара используемой экипировки на %1$d %% на каждый уровень навыка (процент существующего значения, а не процентных пунктов).</string>
+	<string name="skill_longdescription_better_criticals">Увеличивает любой существующий критического умножитель используемой экипировки на %1$d %% на каждый уровень навыка.</string>
+	<string name="skill_longdescription_speed">Увеличивает колчество очков действия (ОД) на %1$d на каждый уровень навыка.</string>
+	<string name="skill_longdescription_coinfinder">Увеличивает шансы найти золото в останках монстра на %1$d %%, и увеличивает количество найденного золота на %2$d %% на каждый уровень навыка (но не более верхнего лимита на золото для этого монстра).</string>
+	<string name="skill_longdescription_more_exp">Увеличивает количество очков опыта, дающегося за победу монстрами на %1$d %% на каждый уровень навыка.</string>
+	<string name="skill_longdescription_cleave">Дает +%1$d очков действия (ОД) за каждое убийство на каждый уровень навыка.</string>
+	<string name="skill_longdescription_eater">Дает +%1$d очков здоровья (ОД) за каждое убийство на каждый уровень навыка.</string>
+	<string name="skill_longdescription_fortitude">На каждом последующем уровне максимальное количество очков здоровья (ОЗ) будет повышаться на %1$d на каждый уровень навыка. Это не применяется задним числом, только к последующим уровням.</string>
+	<string name="skill_longdescription_evasion">Уменьшает вероятность неудач при попытке бежать %1$d %% и шанс, что ближайший монстр будет атаковать, на %2$d %% на каждый уровень навыка.</string>
+	<string name="skill_longdescription_regeneration">Дает +%1$d очков здоровья (ОЗ) каждый ход на каждый уровень навыка.</string>
+	<string name="skill_longdescription_lower_exploss">Уменьшает потери очков опыта при смерти героя на %1$d %% на каждый уровень навыка (процент существующего значения, а не процентных пунктов). После %2$d уровней навыка исчезают все потери опыта, вызванные смертью.</string>
+	<string name="skill_longdescription_magicfinder">Увеличивает шансы найти неординарные предметы на %1$d %% на каждый уровень навыка.</string>
+	<string name="skill_longdescription_resistance_mental">Снижает шансы пострадать от психических воздействий на %1$d %% на каждый уровень навыка, но не более %2$d %%. К таким воздействиям относятся, например, ошеломление или слабость.</string>
+	<string name="skill_longdescription_resistance_physical_capacity">Снижает шансы пострадать от физических воздействий на %1$d %% на каждый уровень навыка, но не более %2$d %%. К таким воздействиям относится, например, усталость.</string>
+	<string name="skill_longdescription_resistance_blood_disorder">Снижает шансы пострадать от воздействий на кровь на %1$d %% на каждый уровень навыка, но не более %2$d %%. К таким воздействиям относятся, например, яд или кровотечение.</string>
+
+	<string name="skillinfo_action_levelup">Повышение уровня</string>
+	<string name="skill_current_level">Текущий уровень: %1$d</string>
+	<string name="skill_current_level_with_maximum">Текущий уровень: %1$d / %2$d</string>
+	<string name="skill_prerequisite_other_skill">Чтобы повысить уровень этого навыка вам нужно иметь уровень не менее %1$d навыка %2$s.</string>
+	<string name="skill_prerequisite_level">Чтобы повысить уровень этого навыка вам нужно иметь уровень опыта не менее %1$d.</string>
+	<string name="skill_prerequisite_stat">Чтобы повысить уровень этого навыка вам нужно иметь не менее %1$d %2$s (базовых характеристик).</string>
+	<string name="skill_number_of_increases_one">Вы можете выбрать один навык для увеличения.</string>
+	<string name="skill_number_of_increases_several">Вы можете выбрать %1$d навыков для увеличения.</string>
+	<string name="levelup_adds_new_skillpoint">Этот уровень дает вам очко для увеличения навыков!</string>
 
 	<string name="loadsave_save_to_new_slot">Создать новый слот для сохранения игры</string>
 	<string name="loadsave_save_overwrite_confirmation_title">Перезаписать сохраненную игру?</string>
-	<string name="loadsave_save_overwrite_confirmation">Это игра содержит героя с другим именем (%1$s), не совпадающим с именем тегущего героя (%2$s). Вы уверены, что хотите перезаписать сохраненную игру?</string> 
-	
+	<string name="loadsave_save_overwrite_confirmation">Это игра содержит героя с другим именем (%1$s), не совпадающим с именем тегущего героя (%2$s). Вы уверены, что хотите перезаписать сохраненную игру?</string>
+
 	<string name="iteminfo_displaytypes_ordinary">Обычный</string>
 	<string name="iteminfo_displaytypes_quest">Необходимый для задания</string>
 	<string name="iteminfo_displaytypes_legendary">Легендарный</string>
 	<string name="iteminfo_displaytypes_extraordinary">Экстраординарный</string>
 	<string name="iteminfo_displaytypes_rare">Редкий</string>
-	
+
 	<string name="actorconditioninfo_category">Условия болезни: %1$s</string>
 	<string name="actorcondition_categories_spiritual">Духовное</string>
 	<string name="actorcondition_categories_mental">Психическое</string>
 	<string name="actorcondition_categories_physical">Физическое</string>
 	<string name="actorcondition_categories_blood">Поражение крови</string>
-	
+
 	<string name="traitsinfo_base_max_hp">Макс. ОЗ:</string>
 	<string name="traitsinfo_base_max_ap">Макс. ОД:</string>
 	<string name="menu_save_saving_not_allowed_in_combat">Невозможно сохранить игру во время боя.</string>
-	
+
 	<string name="preferences_optimized_drawing_title">Оптимизация рисования</string>
 	<string name="preferences_optimized_drawing">Отключить, если вы видите графические глюки. Включение этой опции приводит к перерисовыванию только измененных участков экрана в каждом кадре.</string>
-	
+
 <!-- =========================================== -->
-        <!-- Added in v0.6.11 -->
-        
-        <string name="skill_title_shadow_bless">Тёмное благословение Тени</string>
-    <string name="skill_shortdescription_shadow_bless">Сопротивление против всех типов болезней</string>
-    <string name="skill_longdescription_shadow_bless">Снижает шансы подцепить любую заразу на %1$d %%. Включая все вредные атаки монстров, такие как Отравления, Ошеломления и Усталость.</string>
-    
-    <string name="inventory_movetop">Положить вверх</string>
-    <string name="inventory_movebottom">Положить вниз</string>
-    <string name="actorinfo_immune_criticals">Иммунитет к критическим ударам</string>
-    <string name="traitsinfo_criticalhit_effectivechance">Эффективный шанс крит. удара:</string>
+		<!-- Added in v0.6.11 -->
+
+		<string name="skill_title_shadow_bless">Тёмное благословение Тени</string>
+	<string name="skill_shortdescription_shadow_bless">Сопротивление против всех типов болезней</string>
+	<string name="skill_longdescription_shadow_bless">Снижает шансы подцепить любую заразу на %1$d %%. Включая все вредные атаки монстров, такие как Отравления, Ошеломления и Усталость.</string>
+
+	<string name="inventory_movetop">Положить вверх</string>
+	<string name="inventory_movebottom">Положить вниз</string>
+	<string name="actorinfo_immune_criticals">Иммунитет к критическим ударам</string>
+	<string name="traitsinfo_criticalhit_effectivechance">Эффективный шанс крит. удара:</string>
 
 
-        <string name="skill_title_crit1">Внутренние кровотечение</string>
-    <string name="skill_shortdescription_crit1">Вероятность внутренних кровотечений</string>
-    <string name="skill_longdescription_crit1">При каждом критическом ударе, есть шанс %1$d %% что он вызовет внутренние кровотечение у цели. Внутреннее кровотечение сильно снижает боевые способности, что делает цель менее способной к удачному завершению своих атак.</string>
-        <string name="skill_title_crit2">Перелом</string>
-    <string name="skill_shortdescription_crit2">Вероятность перелома костей</string>
-    <string name="skill_longdescription_crit2">При каждом критическом ударе, есть шанс %1$d %% сломать цели несколько костей. Переломы сильно снижают возможность цели защищать себя.</string>
-    <string name="skill_title_rejuvenation">Восстановление</string>
-    <string name="skill_shortdescription_rejuvenation">Возможен эффект удаления</string>
-    <string name="skill_longdescription_rejuvenation">Каждый раунд (6 секунд), есть шанс %1$d %% что один из негативных эффектов будет уменьшен на один шаг. Это относится ко всем временным эффектам влияющим на тело; психику, напрмер Ошеломление; физическим воздействиям, таким как Усталость и конечно заболевания крови, например отравление.</string>
-        <string name="skill_title_taunt">Насмешка</string>
-    <string name="skill_shortdescription_taunt">Атакующий теряет ОД при промахе</string>
-    <string name="skill_longdescription_taunt">Когда атакующий промахивается, есть шанс %1$d %% что он потеряет %2$d очков движения (ОД). Это относится ко всем атакам ближнего боя.</string>
-        <string name="skill_title_concussion">Сотрясение</string>
-    <string name="skill_shortdescription_concussion">Вероятность сотрясение мозга</string>
-    <string name="skill_longdescription_concussion">Во время атаки цели чей шанс блока (ШБ), по крайней мере на %1$d меньше вашего шанса атаки (ША), есть возможность в %2$d %%, что цель получит сотрясение. Сотрясение сильно снижает боевые способности, что делает цель менее способной к удачному завершению своих атак.</string>
+		<string name="skill_title_crit1">Внутренние кровотечение</string>
+	<string name="skill_shortdescription_crit1">Вероятность внутренних кровотечений</string>
+	<string name="skill_longdescription_crit1">При каждом критическом ударе, есть шанс %1$d %% что он вызовет внутренние кровотечение у цели. Внутреннее кровотечение сильно снижает боевые способности, что делает цель менее способной к удачному завершению своих атак.</string>
+		<string name="skill_title_crit2">Перелом</string>
+	<string name="skill_shortdescription_crit2">Вероятность перелома костей</string>
+	<string name="skill_longdescription_crit2">При каждом критическом ударе, есть шанс %1$d %% сломать цели несколько костей. Переломы сильно снижают возможность цели защищать себя.</string>
+	<string name="skill_title_rejuvenation">Восстановление</string>
+	<string name="skill_shortdescription_rejuvenation">Возможен эффект удаления</string>
+	<string name="skill_longdescription_rejuvenation">Каждый раунд (6 секунд), есть шанс %1$d %% что один из негативных эффектов будет уменьшен на один шаг. Это относится ко всем временным эффектам влияющим на тело; психику, напрмер Ошеломление; физическим воздействиям, таким как Усталость и конечно заболевания крови, например отравление.</string>
+		<string name="skill_title_taunt">Насмешка</string>
+	<string name="skill_shortdescription_taunt">Атакующий теряет ОД при промахе</string>
+	<string name="skill_longdescription_taunt">Когда атакующий промахивается, есть шанс %1$d %% что он потеряет %2$d очков движения (ОД). Это относится ко всем атакам ближнего боя.</string>
+		<string name="skill_title_concussion">Сотрясение</string>
+	<string name="skill_shortdescription_concussion">Вероятность сотрясение мозга</string>
+	<string name="skill_longdescription_concussion">Во время атаки цели чей шанс блока (ШБ), по крайней мере на %1$d меньше вашего шанса атаки (ША), есть возможность в %2$d %%, что цель получит сотрясение. Сотрясение сильно снижает боевые способности, что делает цель менее способной к удачному завершению своих атак.</string>
+
+	<string name="about_button4">О игре</string>
+
+		<!-- =========================================== -->
+		<!-- Added in v0.6.12 -->
+
+	<string name="preferences_ui_category">Интерфейс</string>
+	<string name="preferences_ui_enable_animations_title">Включить анимацию</string>
+	<string name="preferences_ui_enable_animations">Использовать анимацию разных элементов интерфейса, например строка боя.</string>
+	<string name="menu_button_worldmap">Карта</string>
+	<string name="menu_button_worldmap_failed">Карта не может быть показана.</string>
+	<string name="display_worldmap_not_available">Карта не может быть показана из этой локации.</string>
+	<string name="display_worldmap_title">Карта</string>
+
+		<string name="inventory_equip_offhand">Equip (offhand)</string>
+
+		<string name="iteminfo_effect_weapon_attack_cost">Атака стоит: %1$d ОД</string>
+		<string name="iteminfo_effect_increase_attack_cost">Увеличивает стоимости атаки на %1$d ОД</string>
+		<string name="iteminfo_effect_decrease_attack_cost">Уменьшает стоимости атаки на %1$d ОД</string>
+		<string name="iteminfo_effect_weapon_attack_chance">Шанс атаки: %1$d %%</string>
+		<string name="iteminfo_effect_increase_attack_chance">Увеличивает шанс атаки на %1$d %%</string>
+		<string name="iteminfo_effect_decrease_attack_chance">Уменьшает шанс атаки на %1$d %%</string>
+		<string name="iteminfo_effect_weapon_attack_damage">Сила атаки: %1$d</string>
+		<string name="iteminfo_effect_weapon_attack_damage_minmax">Сила атаки: %1$d-%2$d</string>
+		<string name="iteminfo_effect_increase_attack_damage">Увеличивает силу атаки на %1$d</string>
+		<string name="iteminfo_effect_increase_attack_damage_minmax">Увеличивает силу атаки на %1$d-%2$d</string>
+		<string name="iteminfo_effect_decrease_attack_damage">Уменьшает силу атаки на %1$d</string>
+		<string name="iteminfo_effect_decrease_attack_damage_minmax">Уменьшает силу атаки на %1$d-%2$d</string>
+		<string name="iteminfo_effect_increase_critical_skill">Увеличивает шанс крит. удара на %1$d</string>
+		<string name="iteminfo_effect_decrease_critical_skill">Уменьшает шанс крит. удара на %1$d</string>
+		<string name="iteminfo_effect_critical_multiplier">Увеличивает повреждения при крит. ударе в %1$.1f раз(а)</string>
+		<string name="iteminfo_effect_increase_block_chance">Увеличивает шанс блока на %1$d %%</string>
+		<string name="iteminfo_effect_decrease_block_chance">Уменьшает шанс блока на %1$d %%</string>
+		<string name="iteminfo_effect_increase_damage_resistance">Увеличивает сопротивление повреждениям на %1$d</string>
+		<string name="iteminfo_effect_decrease_damage_resistance">Уменьшает сопротивление повреждениям на %1$d</string>
+		<string name="iteminfo_effect_increase_use_cost">Увеличивает необходимое кол-во ОД для использования предметов в бою на %1$d ОД</string>
+		<string name="iteminfo_effect_decrease_use_cost">Уменьшает необходимое кол-во ОД для использования предметов в бою на %1$d ОД</string>
+		<string name="iteminfo_effect_increase_reequip_cost">Увеличивает необходимое кол-во ОД для одевания предметов в бою на %1$d ОД</string>
+		<string name="iteminfo_effect_decrease_reequip_cost">Уменьшает необходимое кол-во ОД для одевания предметов в бою на %1$d ОД</string>
+
+		<string name="loadsave_save_overwrite_confirmation_all">Вы точно хотите перезаписать это сохранение?</string>
+		<string name="loadsave_save_overwrite_confirmation_slot">(слот %1$d)</string>
+		<string name="preferences_display_overwrite_savegame_entries_always_confirm">Всегда показывать диалог подтверждения</string>
+		<string name="preferences_display_overwrite_savegame_entries_confirm_overwrite">Показывать только при перезаписи игроком с другим именем</string>
+		<string name="preferences_display_overwrite_savegame_entries_never_confirm">Не показывать диалог подтверждения</string>
+		<string name="preferences_dialog_overwrite_savegame_title">Перезаписать сохранение</string>
+		<string name="preferences_dialog_overwrite_savegame">Настройка диалога подтверждения при попытке перезаписать сохранение</string>
 
-    <string name="about_button4">О игре</string>
-        
-        <!-- =========================================== -->
-        <!-- Added in v0.6.12 -->
-        
-    <string name="preferences_ui_category">Интерфейс</string>
-    <string name="preferences_ui_enable_animations_title">Включить анимацию</string>
-    <string name="preferences_ui_enable_animations">Использовать анимацию разных элементов интерфейса, например строка боя.</string>
-    <string name="menu_button_worldmap">Карта</string>
-    <string name="menu_button_worldmap_failed">Карта не может быть показана.</string>
-    <string name="display_worldmap_not_available">Карта не может быть показана из этой локации.</string>
-    <string name="display_worldmap_title">Карта</string>
-    
-        <string name="inventory_equip_offhand">Equip (offhand)</string>
-        
-        <string name="iteminfo_effect_weapon_attack_cost">Атака стоит: %1$d ОД</string>
-        <string name="iteminfo_effect_increase_attack_cost">Увеличивает стоимости атаки на %1$d ОД</string>
-        <string name="iteminfo_effect_decrease_attack_cost">Уменьшает стоимости атаки на %1$d ОД</string>
-        <string name="iteminfo_effect_weapon_attack_chance">Шанс атаки: %1$d %%</string>
-        <string name="iteminfo_effect_increase_attack_chance">Увеличивает шанс атаки на %1$d %%</string>
-        <string name="iteminfo_effect_decrease_attack_chance">Уменьшает шанс атаки на %1$d %%</string>
-        <string name="iteminfo_effect_weapon_attack_damage">Сила атаки: %1$d</string>
-        <string name="iteminfo_effect_weapon_attack_damage_minmax">Сила атаки: %1$d-%2$d</string>
-        <string name="iteminfo_effect_increase_attack_damage">Увеличивает силу атаки на %1$d</string>
-        <string name="iteminfo_effect_increase_attack_damage_minmax">Увеличивает силу атаки на %1$d-%2$d</string>
-        <string name="iteminfo_effect_decrease_attack_damage">Уменьшает силу атаки на %1$d</string>
-        <string name="iteminfo_effect_decrease_attack_damage_minmax">Уменьшает силу атаки на %1$d-%2$d</string>
-        <string name="iteminfo_effect_increase_critical_skill">Увеличивает шанс крит. удара на %1$d</string>
-        <string name="iteminfo_effect_decrease_critical_skill">Уменьшает шанс крит. удара на %1$d</string>
-        <string name="iteminfo_effect_critical_multiplier">Увеличивает повреждения при крит. ударе в %1$.1f раз(а)</string>
-        <string name="iteminfo_effect_increase_block_chance">Увеличивает шанс блока на %1$d %%</string>
-        <string name="iteminfo_effect_decrease_block_chance">Уменьшает шанс блока на %1$d %%</string>
-        <string name="iteminfo_effect_increase_damage_resistance">Увеличивает сопротивление повреждениям на %1$d</string>
-        <string name="iteminfo_effect_decrease_damage_resistance">Уменьшает сопротивление повреждениям на %1$d</string>
-        <string name="iteminfo_effect_increase_use_cost">Увеличивает необходимое кол-во ОД для использования предметов в бою на %1$d ОД</string>
-        <string name="iteminfo_effect_decrease_use_cost">Уменьшает необходимое кол-во ОД для использования предметов в бою на %1$d ОД</string>
-        <string name="iteminfo_effect_increase_reequip_cost">Увеличивает необходимое кол-во ОД для одевания предметов в бою на %1$d ОД</string>
-        <string name="iteminfo_effect_decrease_reequip_cost">Уменьшает необходимое кол-во ОД для одевания предметов в бою на %1$d ОД</string>
-        
-        <string name="loadsave_save_overwrite_confirmation_all">Вы точно хотите перезаписать это сохранение?</string> 
-        <string name="loadsave_save_overwrite_confirmation_slot">(слот %1$d)</string>
-        <string name="preferences_display_overwrite_savegame_entries_always_confirm">Всегда показывать диалог подтверждения</string>
-        <string name="preferences_display_overwrite_savegame_entries_confirm_overwrite">Показывать только при перезаписи игроком с другим именем</string>
-        <string name="preferences_display_overwrite_savegame_entries_never_confirm">Не показывать диалог подтверждения</string>
-        <string name="preferences_dialog_overwrite_savegame_title">Перезаписать сохранение</string>
-        <string name="preferences_dialog_overwrite_savegame">Настройка диалога подтверждения при попытке перезаписать сохранение</string>
-        
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
-	
+
 	<string name="localize_resources_from_mo_filename">ru.mo</string>
-                        
+
 </resources>
diff --git a/AndorsTrail/res/values-v10/ui_listviewstyle.xml b/AndorsTrail/res/values-v10/ui_listviewstyle.xml
index a7588256e..7c11f488a 100644
--- a/AndorsTrail/res/values-v10/ui_listviewstyle.xml
+++ b/AndorsTrail/res/values-v10/ui_listviewstyle.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ConversationListView" parent="@android:style/Widget.ListView">
-    	<!-- See http://community.developer.motorola.com/t5/MOTODEV-Blog/Why-Does-My-ListView-Look-Different/ba-p/17462 -->
-    	<item name="android:listSelector">@null</item>
-    	<item name="android:overScrollFooter">@null</item>
+	<style name="ConversationListView" parent="@android:style/Widget.ListView">
+		<!-- See http://community.developer.motorola.com/t5/MOTODEV-Blog/Why-Does-My-ListView-Look-Different/ba-p/17462 -->
+		<item name="android:listSelector">@null</item>
+		<item name="android:overScrollFooter">@null</item>
 	</style>
 </resources>
diff --git a/AndorsTrail/res/values/arrays.xml b/AndorsTrail/res/values/arrays.xml
index 7c3fbf1da..da1fd0406 100644
--- a/AndorsTrail/res/values/arrays.xml
+++ b/AndorsTrail/res/values/arrays.xml
@@ -7,21 +7,21 @@
 		<item>@string/questlog_includecompleted_includecompleted</item>
 		<item>@string/questlog_includecompleted_onlycompleted</item>
 	</string-array>
-	
+
 	<string-array name="preferences_display_loot">
-        <item>@string/preferences_display_loot_dialog</item>
-        <item>@string/preferences_display_loot_dialog_on_items</item>
-        <item>@string/preferences_display_loot_dialog_on_items_or_toast</item>
-        <item>@string/preferences_display_loot_toast</item>
-        <item>@string/preferences_display_loot_toast_on_items</item>
-        <item>@string/preferences_display_loot_never</item>
+		<item>@string/preferences_display_loot_dialog</item>
+		<item>@string/preferences_display_loot_dialog_on_items</item>
+		<item>@string/preferences_display_loot_dialog_on_items_or_toast</item>
+		<item>@string/preferences_display_loot_toast</item>
+		<item>@string/preferences_display_loot_toast_on_items</item>
+		<item>@string/preferences_display_loot_never</item>
 	</string-array>
 	<string-array name="preferences_display_loot_values">
 		<item>0</item>
-        <item>3</item>
-        <item>4</item>
+		<item>3</item>
+		<item>4</item>
 		<item>1</item>
-        <item>5</item>
+		<item>5</item>
 		<item>2</item>
 	</string-array>
 
@@ -93,23 +93,23 @@
 		<item>2</item>
 	</string-array>
 
-    <string-array name="preferences_quickslots_placements">
-        <item>@string/preferences_quickslots_placements_horizontal_center_bottom</item>
-        <item>@string/preferences_quickslots_placements_vertical_center_left</item>
-        <item>@string/preferences_quickslots_placements_vertical_center_right</item>
-        <item>@string/preferences_quickslots_placements_vertical_bottom_left</item>
-        <item>@string/preferences_quickslots_placements_horizontal_bottom_left</item>
-        <item>@string/preferences_quickslots_placements_horizontal_bottom_right</item>
-        <item>@string/preferences_quickslots_placements_vertical_bottom_right</item>
-    </string-array>
-    <string-array name="preferences_quickslots_placements_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>6</item>
-    </string-array>
+	<string-array name="preferences_quickslots_placements">
+		<item>@string/preferences_quickslots_placements_horizontal_center_bottom</item>
+		<item>@string/preferences_quickslots_placements_vertical_center_left</item>
+		<item>@string/preferences_quickslots_placements_vertical_center_right</item>
+		<item>@string/preferences_quickslots_placements_vertical_bottom_left</item>
+		<item>@string/preferences_quickslots_placements_horizontal_bottom_left</item>
+		<item>@string/preferences_quickslots_placements_horizontal_bottom_right</item>
+		<item>@string/preferences_quickslots_placements_vertical_bottom_right</item>
+	</string-array>
+	<string-array name="preferences_quickslots_placements_values">
+		<item>0</item>
+		<item>1</item>
+		<item>2</item>
+		<item>3</item>
+		<item>4</item>
+		<item>5</item>
+		<item>6</item>
+	</string-array>
 
 </resources>
diff --git a/AndorsTrail/res/values/authors.xml b/AndorsTrail/res/values/authors.xml
index 5ae006edd..b4d6b6124 100644
--- a/AndorsTrail/res/values/authors.xml
+++ b/AndorsTrail/res/values/authors.xml
@@ -51,7 +51,7 @@
 		&lt;a href="http://opengameart.org/content/items-set"&gt;Additional graphics by Artur Reterski&lt;/a&gt;&lt;br /&gt;
 		&lt;a href="http://opengameart.org/content/farming-tilesets-magic-animations-and-ui-elements"&gt;Additional graphics by Daniel Eddeland&lt;/a&gt;&lt;br /&gt;
 		&lt;a href="http://opengameart.org/content/liberated-pixel-cup-base-assets-sprites-map-tiles"&gt;Additional graphics by Lanea Zimmerman (AKA Sharm)&lt;/a&gt;&lt;br /&gt;
-        &lt;a href="http://art.gnome.org/themes/icon"&gt;Additional graphics by Gnome icon artists&lt;/a&gt;&lt;br /&gt;
+		&lt;a href="http://art.gnome.org/themes/icon"&gt;Additional graphics by Gnome icon artists&lt;/a&gt;&lt;br /&gt;
 		Additional graphics by DeBray Bailey&lt;br /&gt;
 		&lt;a href="http://rltiles.sourceforge.net"&gt;Monster tileset graphics by rltiles.sourceforge.net&lt;/a&gt;&lt;br /&gt;
 		Part of (or All) the graphic tiles used in this program is the public domain roguelike tileset "RLTiles".
diff --git a/AndorsTrail/res/values/loadresources.xml b/AndorsTrail/res/values/loadresources.xml
index 222f77bc5..66244fbe8 100644
--- a/AndorsTrail/res/values/loadresources.xml
+++ b/AndorsTrail/res/values/loadresources.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <array name="loadresource_itemcategories">
-    	<item>@raw/itemcategories_1</item>
-    </array>
-    
-    <array name="loadresource_actorconditions">
-    	<item>@raw/actorconditions_v069</item>
-    	<item>@raw/actorconditions_v069_bwm</item>
-    	<item>@raw/actorconditions_v0610</item>
-    	<item>@raw/actorconditions_v0611</item>
-    	<item>@raw/actorconditions_v0611_2</item>
-    	<item>@raw/actorconditions_v0612_2</item>
-    	<item>@raw/actorconditions_v070</item>
-    </array>
+	<array name="loadresource_itemcategories">
+		<item>@raw/itemcategories_1</item>
+	</array>
 
-    <array name="loadresource_items">
-        <item>@raw/itemlist_money</item>
-        <item>@raw/itemlist_weapons</item>
-        <item>@raw/itemlist_armour</item>
+	<array name="loadresource_actorconditions">
+		<item>@raw/actorconditions_v069</item>
+		<item>@raw/actorconditions_v069_bwm</item>
+		<item>@raw/actorconditions_v0610</item>
+		<item>@raw/actorconditions_v0611</item>
+		<item>@raw/actorconditions_v0611_2</item>
+		<item>@raw/actorconditions_v0612_2</item>
+		<item>@raw/actorconditions_v070</item>
+	</array>
+
+	<array name="loadresource_items">
+		<item>@raw/itemlist_money</item>
+		<item>@raw/itemlist_weapons</item>
+		<item>@raw/itemlist_armour</item>
 		<item>@raw/itemlist_rings</item>
 		<item>@raw/itemlist_necklaces</item>
 		<item>@raw/itemlist_junk</item>
@@ -36,32 +36,32 @@
 		<item>@raw/itemlist_v0611_3</item>
 		<item>@raw/itemlist_v070</item>
 		<item>@raw/itemlist_v070_questitems</item>
-    </array>
-    
-    <array name="loadresource_droplists">
-    	<item>@raw/droplists_crossglen</item>
-    	<item>@raw/droplists_crossglen_outside</item>
-        <item>@raw/droplists_fallhaven</item>
-        <item>@raw/droplists_wilderness</item>
-        <item>@raw/droplists_v068</item>
-        <item>@raw/droplists_v069_npcs</item>
-        <item>@raw/droplists_v069_monsters</item>
-        <item>@raw/droplists_v0610_shops</item>
-        <item>@raw/droplists_v0610_npcs</item>
-        <item>@raw/droplists_v0610_monsters</item>
-        <item>@raw/droplists_v0611_monsters</item>
-        <item>@raw/droplists_v0611_npcs</item>
-        <item>@raw/droplists_v0611_shops</item>
-        <item>@raw/droplists_v070_quest</item>
-        <item>@raw/droplists_v070_shops</item>
-        <item>@raw/droplists_v070_mobs</item>
-    </array>
-    
-    <array name="loadresource_quests">
-    	<item>@raw/questlist</item>
-    	<item>@raw/questlist_nondisplayed</item>
-    	<item>@raw/questlist_v068</item>
-    	<item>@raw/questlist_v069</item>
+	</array>
+
+	<array name="loadresource_droplists">
+		<item>@raw/droplists_crossglen</item>
+		<item>@raw/droplists_crossglen_outside</item>
+		<item>@raw/droplists_fallhaven</item>
+		<item>@raw/droplists_wilderness</item>
+		<item>@raw/droplists_v068</item>
+		<item>@raw/droplists_v069_npcs</item>
+		<item>@raw/droplists_v069_monsters</item>
+		<item>@raw/droplists_v0610_shops</item>
+		<item>@raw/droplists_v0610_npcs</item>
+		<item>@raw/droplists_v0610_monsters</item>
+		<item>@raw/droplists_v0611_monsters</item>
+		<item>@raw/droplists_v0611_npcs</item>
+		<item>@raw/droplists_v0611_shops</item>
+		<item>@raw/droplists_v070_quest</item>
+		<item>@raw/droplists_v070_shops</item>
+		<item>@raw/droplists_v070_mobs</item>
+	</array>
+
+	<array name="loadresource_quests">
+		<item>@raw/questlist</item>
+		<item>@raw/questlist_nondisplayed</item>
+		<item>@raw/questlist_v068</item>
+		<item>@raw/questlist_v069</item>
 		<item>@raw/questlist_v0610</item>
 		<item>@raw/questlist_v0611</item>
 		<item>@raw/questlist_v0611_2</item>
@@ -70,87 +70,87 @@
 		<item>@raw/questlist_v070_lodar</item>
 		<item>@raw/questlist_v070_lowyna</item>
 		<item>@raw/questlist_v070_misc</item>
-    </array>
-    
-    <array name="loadresource_conversationlists">
-    	<item>@raw/conversationlist_mikhail</item>
-        <item>@raw/conversationlist_crossglen</item>
-        <item>@raw/conversationlist_crossglen_gruil</item>
-        <item>@raw/conversationlist_crossglen_leonid</item>
-        <item>@raw/conversationlist_crossglen_tharal</item>
-        <item>@raw/conversationlist_crossglen_leta</item>
-        <item>@raw/conversationlist_crossglen_odair</item>
-        <item>@raw/conversationlist_jan</item>
-        <item>@raw/conversationlist_fallhaven</item>
-        <item>@raw/conversationlist_fallhaven_arcir</item>
-        <item>@raw/conversationlist_fallhaven_bucus</item>
-        <item>@raw/conversationlist_fallhaven_church</item>
-        <item>@raw/conversationlist_fallhaven_athamyr</item>
-        <item>@raw/conversationlist_fallhaven_drunk</item>
-        <item>@raw/conversationlist_fallhaven_nocmar</item>
-        <item>@raw/conversationlist_fallhaven_oldman</item>
-        <item>@raw/conversationlist_fallhaven_tavern</item>
-        <item>@raw/conversationlist_fallhaven_larcal</item>
-        <item>@raw/conversationlist_fallhaven_unnmir</item>
-        <item>@raw/conversationlist_fallhaven_gaela</item>
-        <item>@raw/conversationlist_fallhaven_vacor</item>
-        <item>@raw/conversationlist_fallhaven_unzel</item>
-        <item>@raw/conversationlist_wilderness</item>
-        <item>@raw/conversationlist_flagstone</item>
-        <item>@raw/conversationlist_fallhaven_south</item>
-        <item>@raw/conversationlist_signs_pre067</item>
-        <item>@raw/conversationlist_thievesguild_1</item>
-        <item>@raw/conversationlist_farrik</item>
-        <item>@raw/conversationlist_fallhaven_warden</item>
-        <item>@raw/conversationlist_umar</item>
-        <item>@raw/conversationlist_kaori</item>
-        <item>@raw/conversationlist_vilegard_villagers</item>
-        <item>@raw/conversationlist_vilegard_erttu</item>
-        <item>@raw/conversationlist_vilegard_tavern</item>
-        <item>@raw/conversationlist_jolnor</item>
-        <item>@raw/conversationlist_alynndir</item>
-        <item>@raw/conversationlist_vilegard_shops</item>
-        <item>@raw/conversationlist_ogam</item>
-        <item>@raw/conversationlist_foamingflask</item>
-        <item>@raw/conversationlist_ambelie</item>
-        <item>@raw/conversationlist_foamingflask_guards</item>
-        <item>@raw/conversationlist_foamingflask_outsideguard</item>
-        <item>@raw/conversationlist_wrye</item>
-        <item>@raw/conversationlist_oluag</item>
-        <item>@raw/conversationlist_signs_v068</item>
-        <item>@raw/conversationlist_maelveon</item>
-        <item>@raw/conversationlist_bwm_agent_1</item>
-        <item>@raw/conversationlist_bwm_agent_2</item>
-        <item>@raw/conversationlist_bwm_agent_3</item>
-        <item>@raw/conversationlist_bwm_agent_4</item>
-        <item>@raw/conversationlist_bwm_agent_5</item>
-        <item>@raw/conversationlist_bwm_agent_6</item>
-        <item>@raw/conversationlist_prim_arghest</item>
-        <item>@raw/conversationlist_prim_outside</item>
-        <item>@raw/conversationlist_prim_inn</item>
-        <item>@raw/conversationlist_prim_tavern</item>
-        <item>@raw/conversationlist_prim_guthbered</item>
-        <item>@raw/conversationlist_blackwater_signs</item>
-        <item>@raw/conversationlist_blackwater_harlenn</item>
-        <item>@raw/conversationlist_blackwater_upper</item>
-        <item>@raw/conversationlist_blackwater_lower</item>
-        <item>@raw/conversationlist_blackwater_herec</item>
-        <item>@raw/conversationlist_prim_bjorgur</item>
-        <item>@raw/conversationlist_prim_fulus</item>
-        <item>@raw/conversationlist_prim_merchants</item>
-        <item>@raw/conversationlist_blackwater_throdna</item>
-        <item>@raw/conversationlist_blackwater_kazaul</item>
-        <item>@raw/conversationlist_erinith</item>
-        <item>@raw/conversationlist_hadracor</item>
-        <item>@raw/conversationlist_tinlyn</item>
-        <item>@raw/conversationlist_tinlyn_sheep</item>
-        <item>@raw/conversationlist_benbyr</item>
-        <item>@raw/conversationlist_crossroads_1</item>
-        <item>@raw/conversationlist_minarra</item>
-        <item>@raw/conversationlist_rogorn</item>
-        <item>@raw/conversationlist_gandoren</item>
-        <item>@raw/conversationlist_ailshara</item>
-        <item>@raw/conversationlist_vilegard_v0610</item>
+	</array>
+
+	<array name="loadresource_conversationlists">
+		<item>@raw/conversationlist_mikhail</item>
+		<item>@raw/conversationlist_crossglen</item>
+		<item>@raw/conversationlist_crossglen_gruil</item>
+		<item>@raw/conversationlist_crossglen_leonid</item>
+		<item>@raw/conversationlist_crossglen_tharal</item>
+		<item>@raw/conversationlist_crossglen_leta</item>
+		<item>@raw/conversationlist_crossglen_odair</item>
+		<item>@raw/conversationlist_jan</item>
+		<item>@raw/conversationlist_fallhaven</item>
+		<item>@raw/conversationlist_fallhaven_arcir</item>
+		<item>@raw/conversationlist_fallhaven_bucus</item>
+		<item>@raw/conversationlist_fallhaven_church</item>
+		<item>@raw/conversationlist_fallhaven_athamyr</item>
+		<item>@raw/conversationlist_fallhaven_drunk</item>
+		<item>@raw/conversationlist_fallhaven_nocmar</item>
+		<item>@raw/conversationlist_fallhaven_oldman</item>
+		<item>@raw/conversationlist_fallhaven_tavern</item>
+		<item>@raw/conversationlist_fallhaven_larcal</item>
+		<item>@raw/conversationlist_fallhaven_unnmir</item>
+		<item>@raw/conversationlist_fallhaven_gaela</item>
+		<item>@raw/conversationlist_fallhaven_vacor</item>
+		<item>@raw/conversationlist_fallhaven_unzel</item>
+		<item>@raw/conversationlist_wilderness</item>
+		<item>@raw/conversationlist_flagstone</item>
+		<item>@raw/conversationlist_fallhaven_south</item>
+		<item>@raw/conversationlist_signs_pre067</item>
+		<item>@raw/conversationlist_thievesguild_1</item>
+		<item>@raw/conversationlist_farrik</item>
+		<item>@raw/conversationlist_fallhaven_warden</item>
+		<item>@raw/conversationlist_umar</item>
+		<item>@raw/conversationlist_kaori</item>
+		<item>@raw/conversationlist_vilegard_villagers</item>
+		<item>@raw/conversationlist_vilegard_erttu</item>
+		<item>@raw/conversationlist_vilegard_tavern</item>
+		<item>@raw/conversationlist_jolnor</item>
+		<item>@raw/conversationlist_alynndir</item>
+		<item>@raw/conversationlist_vilegard_shops</item>
+		<item>@raw/conversationlist_ogam</item>
+		<item>@raw/conversationlist_foamingflask</item>
+		<item>@raw/conversationlist_ambelie</item>
+		<item>@raw/conversationlist_foamingflask_guards</item>
+		<item>@raw/conversationlist_foamingflask_outsideguard</item>
+		<item>@raw/conversationlist_wrye</item>
+		<item>@raw/conversationlist_oluag</item>
+		<item>@raw/conversationlist_signs_v068</item>
+		<item>@raw/conversationlist_maelveon</item>
+		<item>@raw/conversationlist_bwm_agent_1</item>
+		<item>@raw/conversationlist_bwm_agent_2</item>
+		<item>@raw/conversationlist_bwm_agent_3</item>
+		<item>@raw/conversationlist_bwm_agent_4</item>
+		<item>@raw/conversationlist_bwm_agent_5</item>
+		<item>@raw/conversationlist_bwm_agent_6</item>
+		<item>@raw/conversationlist_prim_arghest</item>
+		<item>@raw/conversationlist_prim_outside</item>
+		<item>@raw/conversationlist_prim_inn</item>
+		<item>@raw/conversationlist_prim_tavern</item>
+		<item>@raw/conversationlist_prim_guthbered</item>
+		<item>@raw/conversationlist_blackwater_signs</item>
+		<item>@raw/conversationlist_blackwater_harlenn</item>
+		<item>@raw/conversationlist_blackwater_upper</item>
+		<item>@raw/conversationlist_blackwater_lower</item>
+		<item>@raw/conversationlist_blackwater_herec</item>
+		<item>@raw/conversationlist_prim_bjorgur</item>
+		<item>@raw/conversationlist_prim_fulus</item>
+		<item>@raw/conversationlist_prim_merchants</item>
+		<item>@raw/conversationlist_blackwater_throdna</item>
+		<item>@raw/conversationlist_blackwater_kazaul</item>
+		<item>@raw/conversationlist_erinith</item>
+		<item>@raw/conversationlist_hadracor</item>
+		<item>@raw/conversationlist_tinlyn</item>
+		<item>@raw/conversationlist_tinlyn_sheep</item>
+		<item>@raw/conversationlist_benbyr</item>
+		<item>@raw/conversationlist_crossroads_1</item>
+		<item>@raw/conversationlist_minarra</item>
+		<item>@raw/conversationlist_rogorn</item>
+		<item>@raw/conversationlist_gandoren</item>
+		<item>@raw/conversationlist_ailshara</item>
+		<item>@raw/conversationlist_vilegard_v0610</item>
 		<item>@raw/conversationlist_crossroads_2</item>
 		<item>@raw/conversationlist_crossroads_3</item>
 		<item>@raw/conversationlist_fields_1</item>
@@ -195,65 +195,65 @@
 		<item>@raw/conversationlist_vacor2</item>
 		<item>@raw/conversationlist_unzel2</item>
 		<item>@raw/conversationlist_v0612graves</item>
-    	<item>@raw/conversationlist_agthor</item>
-    	<item>@raw/conversationlist_aulowenn</item>
-    	<item>@raw/conversationlist_charwood1</item>
-    	<item>@raw/conversationlist_charwood2</item>
-    	<item>@raw/conversationlist_esfiume</item>
-    	<item>@raw/conversationlist_falothen</item>
-    	<item>@raw/conversationlist_fayvara</item>
-    	<item>@raw/conversationlist_hirazinn</item>
-    	<item>@raw/conversationlist_kantya</item>
-    	<item>@raw/conversationlist_lethenlor</item>
-    	<item>@raw/conversationlist_lleglaris</item>
-    	<item>@raw/conversationlist_lodar</item>
-    	<item>@raw/conversationlist_lodar0g</item>
-    	<item>@raw/conversationlist_lodarfg</item>
-    	<item>@raw/conversationlist_lodarfg2</item>
-    	<item>@raw/conversationlist_lodarfg3</item>
-    	<item>@raw/conversationlist_lodarfg4</item>
-    	<item>@raw/conversationlist_lowyna</item>
-    	<item>@raw/conversationlist_maevalia</item>
-    	<item>@raw/conversationlist_thukuzun</item>
-    	<item>@raw/conversationlist_tiqui</item>
-    	<item>@raw/conversationlist_twoteeth</item>
-    	<item>@raw/conversationlist_v070signs1</item>
-    	<item>@raw/conversationlist_v070signs2</item>
-    	<item>@raw/conversationlist_woodcabin</item>
-    	<item>@raw/conversationlist_highwayman1</item>
-    	<item>@raw/conversationlist_lodarmobs</item>
-    	<item>@raw/conversationlist_vilegard_v070</item>
-    	<item>@raw/conversationlist_fallhaven_potions</item>
-    </array>
+		<item>@raw/conversationlist_agthor</item>
+		<item>@raw/conversationlist_aulowenn</item>
+		<item>@raw/conversationlist_charwood1</item>
+		<item>@raw/conversationlist_charwood2</item>
+		<item>@raw/conversationlist_esfiume</item>
+		<item>@raw/conversationlist_falothen</item>
+		<item>@raw/conversationlist_fayvara</item>
+		<item>@raw/conversationlist_hirazinn</item>
+		<item>@raw/conversationlist_kantya</item>
+		<item>@raw/conversationlist_lethenlor</item>
+		<item>@raw/conversationlist_lleglaris</item>
+		<item>@raw/conversationlist_lodar</item>
+		<item>@raw/conversationlist_lodar0g</item>
+		<item>@raw/conversationlist_lodarfg</item>
+		<item>@raw/conversationlist_lodarfg2</item>
+		<item>@raw/conversationlist_lodarfg3</item>
+		<item>@raw/conversationlist_lodarfg4</item>
+		<item>@raw/conversationlist_lowyna</item>
+		<item>@raw/conversationlist_maevalia</item>
+		<item>@raw/conversationlist_thukuzun</item>
+		<item>@raw/conversationlist_tiqui</item>
+		<item>@raw/conversationlist_twoteeth</item>
+		<item>@raw/conversationlist_v070signs1</item>
+		<item>@raw/conversationlist_v070signs2</item>
+		<item>@raw/conversationlist_woodcabin</item>
+		<item>@raw/conversationlist_highwayman1</item>
+		<item>@raw/conversationlist_lodarmobs</item>
+		<item>@raw/conversationlist_vilegard_v070</item>
+		<item>@raw/conversationlist_fallhaven_potions</item>
+	</array>
 
-    <array name="loadresource_monsters">
-       	<item>@raw/monsterlist_crossglen_animals</item>
-    	<item>@raw/monsterlist_crossglen_npcs</item>
-    	<item>@raw/monsterlist_fallhaven_animals</item>
-    	<item>@raw/monsterlist_fallhaven_npcs</item>
-    	<item>@raw/monsterlist_wilderness</item>
-    	<item>@raw/monsterlist_v068_npcs</item>
-    	<item>@raw/monsterlist_v069_monsters</item>
-    	<item>@raw/monsterlist_v069_npcs</item>
-    	<item>@raw/monsterlist_v0610_monsters1</item>
-    	<item>@raw/monsterlist_v0610_npcs1</item>
+	<array name="loadresource_monsters">
+		<item>@raw/monsterlist_crossglen_animals</item>
+		<item>@raw/monsterlist_crossglen_npcs</item>
+		<item>@raw/monsterlist_fallhaven_animals</item>
+		<item>@raw/monsterlist_fallhaven_npcs</item>
+		<item>@raw/monsterlist_wilderness</item>
+		<item>@raw/monsterlist_v068_npcs</item>
+		<item>@raw/monsterlist_v069_monsters</item>
+		<item>@raw/monsterlist_v069_npcs</item>
+		<item>@raw/monsterlist_v0610_monsters1</item>
+		<item>@raw/monsterlist_v0610_npcs1</item>
 		<item>@raw/monsterlist_v0610_monsters2</item>
-    	<item>@raw/monsterlist_v0611_monsters1</item>
-    	<item>@raw/monsterlist_v0611_npcs1</item>
-    	<item>@raw/monsterlist_v0611_npcs2</item>
-    	<item>@raw/monsterlist_v070_charwood</item>
-    	<item>@raw/monsterlist_v070_charwood2</item>
-    	<item>@raw/monsterlist_v070_lodar1cave</item>
-    	<item>@raw/monsterlist_v070_lodar5cave</item>
-    	<item>@raw/monsterlist_v070_lodarcave</item>
-    	<item>@raw/monsterlist_v070_lodarmaze</item>
-    	<item>@raw/monsterlist_v070_lodarnpcs</item>
-    	<item>@raw/monsterlist_v070_oldcave</item>
-    	<item>@raw/monsterlist_v070_roadcave</item>
-    	<item>@raw/monsterlist_v070_npcs</item>
-    </array>
-    
-    <array name="loadresource_maps">
+		<item>@raw/monsterlist_v0611_monsters1</item>
+		<item>@raw/monsterlist_v0611_npcs1</item>
+		<item>@raw/monsterlist_v0611_npcs2</item>
+		<item>@raw/monsterlist_v070_charwood</item>
+		<item>@raw/monsterlist_v070_charwood2</item>
+		<item>@raw/monsterlist_v070_lodar1cave</item>
+		<item>@raw/monsterlist_v070_lodar5cave</item>
+		<item>@raw/monsterlist_v070_lodarcave</item>
+		<item>@raw/monsterlist_v070_lodarmaze</item>
+		<item>@raw/monsterlist_v070_lodarnpcs</item>
+		<item>@raw/monsterlist_v070_oldcave</item>
+		<item>@raw/monsterlist_v070_roadcave</item>
+		<item>@raw/monsterlist_v070_npcs</item>
+	</array>
+
+	<array name="loadresource_maps">
 		<item>@xml/home</item>
 		<item>@xml/crossglen</item>
 		<item>@xml/crossglen_farmhouse</item>
@@ -402,7 +402,7 @@
 		<item>@xml/blackwater_mountain50</item>
 		<item>@xml/blackwater_mountain51</item>
 		<item>@xml/blackwater_mountain52</item>
-		
+
 		<!-- maps for v0.6.10 -->
 		<item>@xml/wild0</item>
 		<item>@xml/crossroads</item>
@@ -458,8 +458,8 @@
 		<item>@xml/pwcave2a</item>
 		<item>@xml/pwcave3</item>
 		<item>@xml/pwcave4</item>
-		
-	    <!-- maps for v0.6.11 -->
+
+		<!-- maps for v0.6.11 -->
 		<item>@xml/waterway4</item>
 		<item>@xml/waterway5</item>
 		<item>@xml/waterway6</item>
@@ -540,8 +540,8 @@
 		<item>@xml/lonelyhouse0</item>
 		<item>@xml/lonelyhouse1</item>
 		<item>@xml/wild16_cave</item>
-		
-	    <!-- maps for v0.7.0 -->
+
+		<!-- maps for v0.7.0 -->
 		<item>@xml/gapfiller2</item>
 		<item>@xml/lodar0</item>
 		<item>@xml/lodar1</item>
@@ -637,5 +637,5 @@
 		<item>@xml/tradehouse0</item>
 		<item>@xml/tradehouse1</item>
 		<item>@xml/tradehouse0a</item>
-    </array>
+	</array>
 </resources>
diff --git a/AndorsTrail/res/values/loadresources_debug.xml b/AndorsTrail/res/values/loadresources_debug.xml
index 6a77f9780..f61ef49cc 100644
--- a/AndorsTrail/res/values/loadresources_debug.xml
+++ b/AndorsTrail/res/values/loadresources_debug.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <array name="loadresource_items_debug">
-        <item>@raw/itemlist_money</item>
-        <item>@raw/itemlist_weapons</item>
-        <item>@raw/itemlist_armour</item>
-    	<item>@raw/itemlist_debug</item>
-    </array>
-    
-    <array name="loadresource_droplists_debug">
-    	<item>@raw/droplists_debug</item>
-    </array>
-    
-    <array name="loadresource_quests_debug">
-    	<item>@raw/questlist_debug</item>
-    </array>
-    
-    <array name="loadresource_conversationlists_debug">
-    	<item>@raw/conversationlist_debug</item>
-    </array>
-    
-    <array name="loadresource_monsters_debug">
-    	<item>@raw/monsterlist_debug</item>
-    </array>
-    
-    <array name="loadresource_maps_debug">
-    	<item>@xml/debugmap</item>
-    </array>
+	<array name="loadresource_items_debug">
+		<item>@raw/itemlist_money</item>
+		<item>@raw/itemlist_weapons</item>
+		<item>@raw/itemlist_armour</item>
+		<item>@raw/itemlist_debug</item>
+	</array>
+
+	<array name="loadresource_droplists_debug">
+		<item>@raw/droplists_debug</item>
+	</array>
+
+	<array name="loadresource_quests_debug">
+		<item>@raw/questlist_debug</item>
+	</array>
+
+	<array name="loadresource_conversationlists_debug">
+		<item>@raw/conversationlist_debug</item>
+	</array>
+
+	<array name="loadresource_monsters_debug">
+		<item>@raw/monsterlist_debug</item>
+	</array>
+
+	<array name="loadresource_maps_debug">
+		<item>@xml/debugmap</item>
+	</array>
 </resources>
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 080e46c5a..c0a4c828a 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -3,7 +3,7 @@
 <resources>
 	<string name="app_name">Andor\'s Trail</string>
 	<string name="app_description">Quest-driven fantasy RPG</string>
-	
+
 	<string name="exit">Exit</string>
 	<string name="exit_to_menu">Exit to menu</string>
 	<string name="menu_pause">Pause</string>
@@ -18,17 +18,17 @@
 	<string name="loadsave_selectslot">Select slot</string>
 	<string name="loadsave_slot_empty">(empty)</string>
 	<string name="savegame_currenthero_displayinfo">level %1$d, %2$d exp, %3$d gold</string>
-	
+
 	<string name="dialog_loading_message">Loading resources…</string>
 	<string name="dialog_loading_failed_title">Load Failed</string>
 	<string name="dialog_loading_failed_message">Andor\'s Trail was unable to load the savegame file.\n\n:(\n\nThe file may be damaged or incomplete.</string>
 	<string name="dialog_loading_failed_incorrectversion">Andor\'s Trail was unable to load the savegame file. This savegame file is created with a newer version than what is currently running.</string>
-	
+
 	<string name="dialog_close">Close</string>
-	
+
 	<string name="dialog_confirmexit_title">Exit</string>
 	<string name="dialog_confirmexit_message">Are you sure you want to exit?</string>
-	
+
 	<string name="dialog_paused_title">Paused</string>
 	<string name="dialog_paused_message">Game is paused</string>
 	<string name="dialog_paused_resume">Resume</string>
@@ -49,13 +49,13 @@
 	<string name="heroinfo_spell">Spells</string>
 	<string name="heroinfo_levelup">Level up</string>
 	<string name="heroinfo_level">Level</string>
-	<string name="heroinfo_totalexperience">Total experience</string>	
+	<string name="heroinfo_totalexperience">Total experience</string>
 	<string name="heroinfo_wornequipment">Worn equipment</string>
 	<string name="heroinfo_inventory">Inventory</string>
 	<string name="heroinfo_gold">Gold: %1$d</string>
 	<string name="heroinfo_actionpoints">Action points (AP):</string>
 	<string name="heroinfo_quests">Quests</string>
-	
+
 	<string name="combat_attack">Attack (%1$d AP)</string>
 	<string name="combat_move">Move (%1$d AP)</string>
 	<string name="combat_use">Use item</string>
@@ -68,7 +68,7 @@
 	<string name="combat_status_ap">AP: %1$d</string>
 	<string name="combat_monsterhealth">HP:</string>
 	<string name="combat_monsteraction">%1$s is attacking.</string>
-	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string>  -->
+	<!-- <string name="combat_cannotexitcombat">You cannot exit combat since there are adjacent monsters. You first have to move by long-clicking a place with no adjacent monster, before you may end the combat.</string> -->
 	<string name="combat_result_monstermiss">%1$s misses!</string>
 	<string name="combat_result_monsterhit">%1$s hits you for %2$d hp!</string>
 	<string name="combat_result_monsterhitcritical">%1$s gets a critical hit for %2$d hp!</string>
@@ -78,7 +78,7 @@
 	<string name="combat_result_herokillsmonster">%1$s dies!</string>
 	<string name="combat_not_enough_ap">Not enough AP left this round.</string>
 	<string name="combat_hero_dies">You fall unconscious, but fortunately wake up alive, dazed and fatigued. You lost %1$d experience.</string>
-		
+
 	<string name="inventory_info">Info</string>
 	<string name="inventory_equip">Equip</string>
 	<string name="inventory_unequip">Unequip</string>
@@ -97,35 +97,35 @@
 	<string name="dialog_monsterloot_title">Victory</string>
 	<string name="dialog_monsterloot_message">You survived the encounter. </string>
 	<string name="dialog_monsterloot_gainedexp">You gained %1$d experience. </string>
-    
-    <string name="monster_difficulty_veryeasy">Very easy</string>
-    <string name="monster_difficulty_easy">Easy</string>
-    <string name="monster_difficulty_normal">Normal</string>
-    <string name="monster_difficulty_hard">Hard</string>
-    <string name="monster_difficulty_veryhard">Very hard</string>
-    <string name="monster_difficulty_impossible">Impossible</string>
 
-    <string name="actorinfo_class">Class:</string>
-    <string name="actorinfo_difficulty">Difficulty:</string>
-    <string name="actorinfo_health">Health:</string>
-    <string name="actorinfo_attacksperturn">Attacks/turn:</string>
-    <string name="actorinfo_movesperturn">Movement/turn:</string>
-    <string name="actorinfo_attack">Attack:</string>
-    <string name="actorinfo_criticalhit">Critical hit:</string>
-    <string name="actorinfo_defense">Defense:</string>
-    <string name="actorinfo_movecost">Move cost (AP):</string>
-    <string name="actorinfo_basetraits">Base combat statistics (without equipment and skills)</string>
-    <string name="actorinfo_currenttraits">Combat statistics (current)</string>
-    
-    <string name="traitsinfo_attack_cost">Attack cost (AP):</string>
-    <string name="traitsinfo_attack_chance">Attack chance:</string>
-    <string name="traitsinfo_attack_damage">Attack damage:</string>
-    <string name="traitsinfo_criticalhit_skill">Critical hit skill:</string>
-    <string name="traitsinfo_criticalhit_multiplier">Critical multiplier:</string>
-    <string name="traitsinfo_defense_chance">Block chance:</string>
-    <string name="traitsinfo_defense_damageresist">Damage resistance:</string>
-    
-	<!-- <string name="key_required">A specific key is required to pass.</string>  -->
+	<string name="monster_difficulty_veryeasy">Very easy</string>
+	<string name="monster_difficulty_easy">Easy</string>
+	<string name="monster_difficulty_normal">Normal</string>
+	<string name="monster_difficulty_hard">Hard</string>
+	<string name="monster_difficulty_veryhard">Very hard</string>
+	<string name="monster_difficulty_impossible">Impossible</string>
+
+	<string name="actorinfo_class">Class:</string>
+	<string name="actorinfo_difficulty">Difficulty:</string>
+	<string name="actorinfo_health">Health:</string>
+	<string name="actorinfo_attacksperturn">Attacks/turn:</string>
+	<string name="actorinfo_movesperturn">Movement/turn:</string>
+	<string name="actorinfo_attack">Attack:</string>
+	<string name="actorinfo_criticalhit">Critical hit:</string>
+	<string name="actorinfo_defense">Defense:</string>
+	<string name="actorinfo_movecost">Move cost (AP):</string>
+	<string name="actorinfo_basetraits">Base combat statistics (without equipment and skills)</string>
+	<string name="actorinfo_currenttraits">Combat statistics (current)</string>
+
+	<string name="traitsinfo_attack_cost">Attack cost (AP):</string>
+	<string name="traitsinfo_attack_chance">Attack chance:</string>
+	<string name="traitsinfo_attack_damage">Attack damage:</string>
+	<string name="traitsinfo_criticalhit_skill">Critical hit skill:</string>
+	<string name="traitsinfo_criticalhit_multiplier">Critical multiplier:</string>
+	<string name="traitsinfo_defense_chance">Block chance:</string>
+	<string name="traitsinfo_defense_damageresist">Damage resistance:</string>
+
+	<!-- <string name="key_required">A specific key is required to pass.</string> -->
 
 	<string name="iteminfo_category">Category: </string>
 	<string name="iteminfo_action_use">Use</string>
@@ -146,15 +146,15 @@
 	<string name="itemcategory_wearable_ring">Wearable (ring)</string>
 	<string name="itemcategory_potion">Potion</string>
 	<string name="itemcategory_other">Other</string>
-	
+
 	<string name="startscreen_continue">Continue current game</string>
 	<string name="startscreen_newgame">New game</string>
 	<string name="startscreen_newgame_confirm">You will lose your current game and your current character, are you sure you want to start a new game?</string>
 	<string name="startscreen_about">About/help</string>
 	<string name="startscreen_enterheroname">Enter hero name</string>
 	<string name="startscreen_load">Load</string>
-	
-	<!-- <string name="conversation_title">%1$s says</string>  -->
+
+	<!-- <string name="conversation_title">%1$s says</string> -->
 	<string name="conversation_rewardexp"> [You gained %1$d experience]</string>
 	<string name="conversation_rewardgold"> [You gained %1$d gold]</string>
 	<string name="conversation_lostgold"> [You lost %1$d gold]</string>
@@ -162,7 +162,7 @@
 	<string name="conversation_rewarditems"> [You gained %1$d items]</string>
 	<string name="conversation_next">Next</string>
 	<string name="conversation_leave">Leave</string>
-	
+
 	<string name="shop_buy">Buy</string>
 	<string name="shop_sell">Sell</string>
 	<string name="shop_infoitem">Info</string>
@@ -171,7 +171,7 @@
 	<string name="shop_yourgold">Your gold: %1$d</string>
 	<string name="shop_item_bought">%1$s bought.</string>
 	<string name="shop_item_sold">%1$s sold.</string>
-	
+
 	<string name="levelup_title">Level up</string>
 	<string name="levelup_description">Welcome to level %1$d!</string>
 	<string name="levelup_buttontext">Level up</string>
@@ -183,7 +183,7 @@
 	<string name="levelup_add_attackdamage_description">Adds %1$d to your base attack damage.</string>
 	<string name="levelup_add_blockchance">Increase block chance (+%1$d %%)</string>
 	<string name="levelup_add_blockchance_description">Adds %1$d%% to your base block chance.</string>
-	
+
 	<string name="dialog_rest_title">Rest</string>
 	<string name="dialog_rest_confirm_message">Do you want to rest here?</string>
 	<string name="dialog_rest_message">You have rested and regained your full health.</string>
@@ -203,10 +203,10 @@
 		Please visit the forums to discuss the game with other players.&lt;br /&gt;
 	</string>
 
-	<!-- 
-		This is the GNU GPL v2 text, originally from 
+	<!--
+		This is the GNU GPL v2 text, originally from
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-		For translation of this text, you might be able to find a version in your language here: 
+		For translation of this text, you might be able to find a version in your language here:
 			http://www.gnu.org/licenses/old-licenses/gpl-2.0-translations.html
 	-->
 	<string name="about_contents3">
@@ -218,7 +218,7 @@
 		&lt;br /&gt;
 		For source code and feature requests, please visit the project page at &lt;a href="http://code.google.com/p/andors-trail/"&gt;http://code.google.com/p/andors-trail/&lt;/a&gt;&lt;br /&gt;
 	</string>
-	
+
 	<string name="dialog_newversion_title">Welcome</string>
 	<string name="dialog_newversion_message">
 		Thank you for downloading Andor\'s Trail!\n\n
@@ -226,17 +226,17 @@
 		Please visit the project forums to discuss the game with other players or to help make the game even better (see "about").\n
 		\n
 		Thanks for all the feedback!
-	</string> 
-	
+	</string>
+
 	<string name="questlog_title">Quests</string>
 	<string name="questlog_includecompleted_prompt">Select quests to show</string>
-    <string name="questlog_includecompleted_hidecompleted">Hide completed quests</string>
-    <string name="questlog_includecompleted_includecompleted">Include completed quests</string>
-    <string name="questlog_includecompleted_onlycompleted">Only completed quests</string>
+	<string name="questlog_includecompleted_hidecompleted">Hide completed quests</string>
+	<string name="questlog_includecompleted_includecompleted">Include completed quests</string>
+	<string name="questlog_includecompleted_onlycompleted">Only completed quests</string>
 	<string name="questlog_queststatus">Status: %1$s</string>
 	<string name="questlog_queststatus_inprogress">In progress</string>
 	<string name="questlog_queststatus_completed">Completed</string>
-	
+
 	<string name="preferences_display_category">Display</string>
 	<string name="preferences_display_fullscreen_title">Fullscreen</string>
 	<string name="preferences_display_fullscreen">Displays the game in fullscreen mode. (Requires restart)</string>
@@ -251,23 +251,23 @@
 	<string name="preferences_combat_speed_title">Combat speed</string>
 	<string name="preferences_combat_speed">Determines how fast monsters attack.</string>
 
-    <string name="preferences_display_loot_dialog">Always show loot dialog box</string>
-    <string name="preferences_display_loot_dialog_on_items">Show loot dialog box when finding items</string>
-    <string name="preferences_display_loot_dialog_on_items_or_toast">Dialog for items, notif. otherwise</string>
-    <string name="preferences_display_loot_toast">Show short notification</string>
-    <string name="preferences_display_loot_toast_on_items">Show notification only when finding items</string>
-    <string name="preferences_display_loot_never">Do not display</string>
+	<string name="preferences_display_loot_dialog">Always show loot dialog box</string>
+	<string name="preferences_display_loot_dialog_on_items">Show loot dialog box when finding items</string>
+	<string name="preferences_display_loot_dialog_on_items_or_toast">Dialog for items, notif. otherwise</string>
+	<string name="preferences_display_loot_toast">Show short notification</string>
+	<string name="preferences_display_loot_toast_on_items">Show notification only when finding items</string>
+	<string name="preferences_display_loot_never">Do not display</string>
+
+	<string name="preferences_attackspeed_instant">Instant (no animations)</string>
+	<string name="preferences_attackspeed_fast">Fast</string>
+	<string name="preferences_attackspeed_normal">Normal</string>
+	<string name="preferences_attackspeed_slow">Slow</string>
 
-    <string name="preferences_attackspeed_instant">Instant (no animations)</string>
-    <string name="preferences_attackspeed_fast">Fast</string>
-    <string name="preferences_attackspeed_normal">Normal</string>
-    <string name="preferences_attackspeed_slow">Slow</string>
-	
 	<string name="preferences_movement_category">Movement</string>
 	<string name="preferences_movementmethod_title">Movement method</string>
 	<string name="preferences_movementmethod">Type of movement method and handling of obstacles.</string>
-    <string name="preferences_movementmethods_straight">Straight (original)</string>
-    <string name="preferences_movementmethods_avoid">Avoiding obstacles</string>
+	<string name="preferences_movementmethods_straight">Straight (original)</string>
+	<string name="preferences_movementmethods_avoid">Avoiding obstacles</string>
 
 
 	<!-- =========================================== -->
@@ -284,49 +284,49 @@
 	<string name="iteminfo_effect_works_when_killing_target">On every kill</string>
 	<string name="iteminfo_effect_works_when_used">When used</string>
 	<string name="iteminfo_effect_works_when_equipped">When equipped</string>
-	
+
 	<string name="iteminfo_effect_decrease_current_hp">Drains %1$s HP</string>
 	<string name="iteminfo_effect_increase_current_hp">Restores %1$s HP</string>
 	<string name="iteminfo_effect_decrease_current_ap">Drains %1$s AP</string>
 	<string name="iteminfo_effect_increase_current_ap">Restores %1$s AP</string>
-	
+
 	<string name="iteminfo_effect_increase_max_hp">Raises max HP +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_hp">Lowers max HP by %1$d</string>
 	<string name="iteminfo_effect_increase_max_ap">Raises max AP +%1$d</string>
 	<string name="iteminfo_effect_decrease_max_ap">Lowers max AP by %1$d</string>
 	<string name="iteminfo_effect_increase_movecost">Move cost penalty +%1$d AP</string>
 	<string name="iteminfo_effect_decrease_movecost">Lowers move cost %1$d AP</string>
-	
+
 	<string name="preferences_display_scaling_factor_title">Scaling factor</string>
 	<string name="preferences_display_scaling_factor">Makes the game view display everything larger.</string>
-    <string name="preferences_display_scaling_factor_normal">Normal size</string>
-    <string name="preferences_display_scaling_factor_50_percent_larger">1.5x size</string>
-    <string name="preferences_display_scaling_factor_double">Double size</string>
-	
+	<string name="preferences_display_scaling_factor_normal">Normal size</string>
+	<string name="preferences_display_scaling_factor_50_percent_larger">1.5x size</string>
+	<string name="preferences_display_scaling_factor_double">Double size</string>
+
 	<string name="inventory_assign">Assign quick slot</string>
 	<string name="inventory_assign_slot1">Slot 1</string>
 	<string name="inventory_assign_slot2">Slot 2</string>
 	<string name="inventory_assign_slot3">Slot 3</string>
 	<string name="inventory_unassign">Un-assign quick slot</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.6.10 -->
-	
+
 	<string name="preferences_movement_dpad_position_title">Virtual d-pad</string>
 	<string name="preferences_movement_dpad_position">Enables a virtual on-screen directional pad to guide movement.</string>
 	<string name="preferences_movement_dpad_minimizeable_title">Minimizable d-pad</string>
 	<string name="preferences_movement_dpad_minimizeable">If the virtual d-pad is enabled, this setting allows the d-pad to be minimized by pressing its center.</string>
 
-    <string name="preferences_movement_dpad_positions_disabled">Disabled</string>
-    <string name="preferences_movement_dpad_positions_lower_right">Lower right corner</string>
-    <string name="preferences_movement_dpad_positions_lower_left">Lower left corner</string>
-    <string name="preferences_movement_dpad_positions_center_bottom">Center bottom</string>
-    <string name="preferences_movement_dpad_positions_center_left">Center left</string>
-    <string name="preferences_movement_dpad_positions_center_right">Center right</string>
-    <string name="preferences_movement_dpad_positions_upper_left">Upper left corner</string>
-    <string name="preferences_movement_dpad_positions_upper_right">Upper right corner</string>
-    <string name="preferences_movement_dpad_positions_center_top">Center top</string>
-	
+	<string name="preferences_movement_dpad_positions_disabled">Disabled</string>
+	<string name="preferences_movement_dpad_positions_lower_right">Lower right corner</string>
+	<string name="preferences_movement_dpad_positions_lower_left">Lower left corner</string>
+	<string name="preferences_movement_dpad_positions_center_bottom">Center bottom</string>
+	<string name="preferences_movement_dpad_positions_center_left">Center left</string>
+	<string name="preferences_movement_dpad_positions_center_right">Center right</string>
+	<string name="preferences_movement_dpad_positions_upper_left">Upper left corner</string>
+	<string name="preferences_movement_dpad_positions_upper_right">Upper right corner</string>
+	<string name="preferences_movement_dpad_positions_center_top">Center top</string>
+
 	<string name="actorconditioninfo_constant_effect">Constant effect</string>
 	<string name="actorconditioninfo_effect_every_round">Every round</string>
 	<string name="actorconditioninfo_effect_every_full_round">Every full round</string>
@@ -335,146 +335,146 @@
 	<string name="bulkselection_select_all">All</string>
 	<string name="bulkselection_sell_confirmation_title">Are you sure?</string>
 	<string name="bulkselection_sell_confirmation">Are you sure you want to sell %1$s? This item is %2$s and you might not be able to recover it.</string>
-	
-    <string name="skill_title_weapon_chance">Weapon Accuracy</string>
-    <string name="skill_title_weapon_dmg">Hard Hit</string>
-    <string name="skill_title_barter">Merchant</string>
-    <string name="skill_title_dodge">Dodge</string>
-    <string name="skill_title_barkskin">Bark Skin</string>
-    <string name="skill_title_more_criticals">More Criticals</string>
-    <string name="skill_title_better_criticals">Better Criticals</string>
-    <string name="skill_title_speed">Combat Speed</string>
-    <string name="skill_title_coinfinder">Treasure Hunter</string>
-    <string name="skill_title_more_exp">Quick Learner</string>
-    <string name="skill_title_cleave">Cleave</string>
-    <string name="skill_title_eater">Corpse Eater</string>
-    <string name="skill_title_fortitude">Increased Fortitude</string>
-    <string name="skill_title_evasion">Evasion</string>
-    <string name="skill_title_regeneration">Regeneration</string>
-    <string name="skill_title_lower_exploss">Failure Mastery</string>
-    <string name="skill_title_magicfinder">Magic Finder</string>
-    <string name="skill_title_resistance_mental">Strong Mind</string>
-    <string name="skill_title_resistance_physical_capacity">Enduring Body</string>
-    <string name="skill_title_resistance_blood_disorder">Pure Blood</string>
-    
-    <string name="skill_shortdescription_weapon_chance">Increased attack chance</string>
-    <string name="skill_shortdescription_weapon_dmg">Increased attack damage</string>
-    <string name="skill_shortdescription_barter">Better shop prices</string>
-    <string name="skill_shortdescription_dodge">Increased block chance</string>
-    <string name="skill_shortdescription_barkskin">Damage resistance</string>
-    <string name="skill_shortdescription_more_criticals">Increased critical skill</string>
-    <string name="skill_shortdescription_better_criticals">Increased critical damage</string>
-    <string name="skill_shortdescription_speed">Increased maximum action points</string>
-    <string name="skill_shortdescription_coinfinder">Higher chance of finding gold</string>
-    <string name="skill_shortdescription_more_exp">More experience from monster kills</string>
-    <string name="skill_shortdescription_cleave">Recover action points on every kill</string>
-    <string name="skill_shortdescription_eater">Recover health points on every kill</string>
-    <string name="skill_shortdescription_fortitude">Gain health on each level up</string>
-    <string name="skill_shortdescription_evasion">Increased chance of fleeing</string>
-    <string name="skill_shortdescription_regeneration">Gain health every round</string>
-    <string name="skill_shortdescription_lower_exploss">Decrease amount of lost experience when dying</string>
-    <string name="skill_shortdescription_magicfinder">Increased chance of finding magic items</string>
-    <string name="skill_shortdescription_resistance_mental">Resistance against mental conditions</string>
-    <string name="skill_shortdescription_resistance_physical_capacity">Resistance against physical capacity conditions</string>
-    <string name="skill_shortdescription_resistance_blood_disorder">Resistance against blood disorders</string>
-    
-    <string name="skill_longdescription_weapon_chance">Increases attack chance by %1$d percentage points for each skill level.</string>
-    <string name="skill_longdescription_weapon_dmg">Increases max damage by %1$d for each skill level.</string>
-    <string name="skill_longdescription_barter">For every skill level, decreases the buying and selling gold penalty by %1$d percentage points.</string>
-    <string name="skill_longdescription_dodge">Increases block chance by %1$d percentage points for each skill level.</string>
-    <string name="skill_longdescription_barkskin">Increases damage resistance by %1$d for each skill level.</string>
-    <string name="skill_longdescription_more_criticals">Increases any existing critical skill given by equipment by %1$d %% for each skill level (percentage of existing critical skill value, not percentage points).</string>
-    <string name="skill_longdescription_better_criticals">Increases any existing critical multiplier given by equipment by %1$d %% for each skill level.</string>
-    <string name="skill_longdescription_speed">Increases maximum action points (AP) by %1$d for each skill level.</string>
-    <string name="skill_longdescription_coinfinder">Increases chance of finding gold in monster drops by %1$d %%, and increases amount of gold in drops by %2$d %% for each skill level (up to the maximum amount that the monster drops).</string>
-    <string name="skill_longdescription_more_exp">Increases amount of exp given by defeating monsters by %1$d %% for each skill level.</string>
-    <string name="skill_longdescription_cleave">Gives +%1$d action points (AP) on every kill per skill level.</string>
-    <string name="skill_longdescription_eater">Gives +%1$d health points (HP) on every kill per skill level.</string>
-    <string name="skill_longdescription_fortitude">On every subsequent level-up, maximum health points (HP) will be raised by %1$d per skill level. This is not applied retroactively, only subsequent level-ups will be affected.</string>
-    <string name="skill_longdescription_evasion">For every skill level, reduces both the chance of failed flee attempts by %1$d %% and the chance that an adjacent monster will attack by %2$d %%.</string>
-    <string name="skill_longdescription_regeneration">Gain +%1$d health points (HP) on every round per skill level when no monsters are directly adjacent.</string>
-    <string name="skill_longdescription_lower_exploss">For every skill level, reduces the amount of lost experience caused by death by %1$d %% (percentage of existing exp loss value, not percentage points). %2$d levels will remove all experience loss caused by death.</string>
-    <string name="skill_longdescription_magicfinder">Increases the chance of finding non-ordinary items by %1$d %% for every skill level.</string>
-    <string name="skill_longdescription_resistance_mental">Lowers the chance of being afflicted with mental conditions by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Dazed or Weapon Feebleness.</string>
-    <string name="skill_longdescription_resistance_physical_capacity">Lowers the chance of being afflicted with conditions affecting your physical capacity by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Fatigue.</string>
-    <string name="skill_longdescription_resistance_blood_disorder">Lowers the chance of being afflicted with disorders of the blood by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Poison or bleeding wounds.</string>
-    
-    <string name="skillinfo_action_levelup">Level up</string>
-    <string name="skill_current_level">Current level: %1$d</string>
-    <string name="skill_current_level_with_maximum">Current level: %1$d / %2$d</string>
-    <string name="skill_prerequisite_other_skill">To level up this skill, you need at least level %1$d of the %2$s skill.</string>
-    <string name="skill_prerequisite_level">To level up this skill, you need at least experience level %1$d.</string>
-    <string name="skill_prerequisite_stat">To level up this skill, you need at least %1$d %2$s (base stats).</string>
-    <string name="skill_number_of_increases_one">You may select one skill to increase.</string>
-    <string name="skill_number_of_increases_several">You may select %1$d skills to increase.</string>
-    <string name="levelup_adds_new_skillpoint">This level also gives you a new skill point to spend!</string>
+
+	<string name="skill_title_weapon_chance">Weapon Accuracy</string>
+	<string name="skill_title_weapon_dmg">Hard Hit</string>
+	<string name="skill_title_barter">Merchant</string>
+	<string name="skill_title_dodge">Dodge</string>
+	<string name="skill_title_barkskin">Bark Skin</string>
+	<string name="skill_title_more_criticals">More Criticals</string>
+	<string name="skill_title_better_criticals">Better Criticals</string>
+	<string name="skill_title_speed">Combat Speed</string>
+	<string name="skill_title_coinfinder">Treasure Hunter</string>
+	<string name="skill_title_more_exp">Quick Learner</string>
+	<string name="skill_title_cleave">Cleave</string>
+	<string name="skill_title_eater">Corpse Eater</string>
+	<string name="skill_title_fortitude">Increased Fortitude</string>
+	<string name="skill_title_evasion">Evasion</string>
+	<string name="skill_title_regeneration">Regeneration</string>
+	<string name="skill_title_lower_exploss">Failure Mastery</string>
+	<string name="skill_title_magicfinder">Magic Finder</string>
+	<string name="skill_title_resistance_mental">Strong Mind</string>
+	<string name="skill_title_resistance_physical_capacity">Enduring Body</string>
+	<string name="skill_title_resistance_blood_disorder">Pure Blood</string>
+
+	<string name="skill_shortdescription_weapon_chance">Increased attack chance</string>
+	<string name="skill_shortdescription_weapon_dmg">Increased attack damage</string>
+	<string name="skill_shortdescription_barter">Better shop prices</string>
+	<string name="skill_shortdescription_dodge">Increased block chance</string>
+	<string name="skill_shortdescription_barkskin">Damage resistance</string>
+	<string name="skill_shortdescription_more_criticals">Increased critical skill</string>
+	<string name="skill_shortdescription_better_criticals">Increased critical damage</string>
+	<string name="skill_shortdescription_speed">Increased maximum action points</string>
+	<string name="skill_shortdescription_coinfinder">Higher chance of finding gold</string>
+	<string name="skill_shortdescription_more_exp">More experience from monster kills</string>
+	<string name="skill_shortdescription_cleave">Recover action points on every kill</string>
+	<string name="skill_shortdescription_eater">Recover health points on every kill</string>
+	<string name="skill_shortdescription_fortitude">Gain health on each level up</string>
+	<string name="skill_shortdescription_evasion">Increased chance of fleeing</string>
+	<string name="skill_shortdescription_regeneration">Gain health every round</string>
+	<string name="skill_shortdescription_lower_exploss">Decrease amount of lost experience when dying</string>
+	<string name="skill_shortdescription_magicfinder">Increased chance of finding magic items</string>
+	<string name="skill_shortdescription_resistance_mental">Resistance against mental conditions</string>
+	<string name="skill_shortdescription_resistance_physical_capacity">Resistance against physical capacity conditions</string>
+	<string name="skill_shortdescription_resistance_blood_disorder">Resistance against blood disorders</string>
+
+	<string name="skill_longdescription_weapon_chance">Increases attack chance by %1$d percentage points for each skill level.</string>
+	<string name="skill_longdescription_weapon_dmg">Increases max damage by %1$d for each skill level.</string>
+	<string name="skill_longdescription_barter">For every skill level, decreases the buying and selling gold penalty by %1$d percentage points.</string>
+	<string name="skill_longdescription_dodge">Increases block chance by %1$d percentage points for each skill level.</string>
+	<string name="skill_longdescription_barkskin">Increases damage resistance by %1$d for each skill level.</string>
+	<string name="skill_longdescription_more_criticals">Increases any existing critical skill given by equipment by %1$d %% for each skill level (percentage of existing critical skill value, not percentage points).</string>
+	<string name="skill_longdescription_better_criticals">Increases any existing critical multiplier given by equipment by %1$d %% for each skill level.</string>
+	<string name="skill_longdescription_speed">Increases maximum action points (AP) by %1$d for each skill level.</string>
+	<string name="skill_longdescription_coinfinder">Increases chance of finding gold in monster drops by %1$d %%, and increases amount of gold in drops by %2$d %% for each skill level (up to the maximum amount that the monster drops).</string>
+	<string name="skill_longdescription_more_exp">Increases amount of exp given by defeating monsters by %1$d %% for each skill level.</string>
+	<string name="skill_longdescription_cleave">Gives +%1$d action points (AP) on every kill per skill level.</string>
+	<string name="skill_longdescription_eater">Gives +%1$d health points (HP) on every kill per skill level.</string>
+	<string name="skill_longdescription_fortitude">On every subsequent level-up, maximum health points (HP) will be raised by %1$d per skill level. This is not applied retroactively, only subsequent level-ups will be affected.</string>
+	<string name="skill_longdescription_evasion">For every skill level, reduces both the chance of failed flee attempts by %1$d %% and the chance that an adjacent monster will attack by %2$d %%.</string>
+	<string name="skill_longdescription_regeneration">Gain +%1$d health points (HP) on every round per skill level when no monsters are directly adjacent.</string>
+	<string name="skill_longdescription_lower_exploss">For every skill level, reduces the amount of lost experience caused by death by %1$d %% (percentage of existing exp loss value, not percentage points). %2$d levels will remove all experience loss caused by death.</string>
+	<string name="skill_longdescription_magicfinder">Increases the chance of finding non-ordinary items by %1$d %% for every skill level.</string>
+	<string name="skill_longdescription_resistance_mental">Lowers the chance of being afflicted with mental conditions by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Dazed or Weapon Feebleness.</string>
+	<string name="skill_longdescription_resistance_physical_capacity">Lowers the chance of being afflicted with conditions affecting your physical capacity by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Fatigue.</string>
+	<string name="skill_longdescription_resistance_blood_disorder">Lowers the chance of being afflicted with disorders of the blood by %1$d %% for every skill level, up to a maximum of %2$d %%. This includes conditions caused by monster attacks such as Poison or bleeding wounds.</string>
+
+	<string name="skillinfo_action_levelup">Level up</string>
+	<string name="skill_current_level">Current level: %1$d</string>
+	<string name="skill_current_level_with_maximum">Current level: %1$d / %2$d</string>
+	<string name="skill_prerequisite_other_skill">To level up this skill, you need at least level %1$d of the %2$s skill.</string>
+	<string name="skill_prerequisite_level">To level up this skill, you need at least experience level %1$d.</string>
+	<string name="skill_prerequisite_stat">To level up this skill, you need at least %1$d %2$s (base stats).</string>
+	<string name="skill_number_of_increases_one">You may select one skill to increase.</string>
+	<string name="skill_number_of_increases_several">You may select %1$d skills to increase.</string>
+	<string name="levelup_adds_new_skillpoint">This level also gives you a new skill point to spend!</string>
 
 	<string name="loadsave_save_to_new_slot">Create new savegame slot</string>
 	<string name="loadsave_save_overwrite_confirmation_title">Overwrite savegame?</string>
 	<string name="loadsave_save_overwrite_confirmation">This savegame contains a different player name (%1$s) than your current player name (%2$s). Are you sure you want to overwrite this savegame?</string>
 
-    <string name="iteminfo_displaytypes_ordinary">Ordinary</string>
-    <string name="iteminfo_displaytypes_quest">Quest item</string>
-    <string name="iteminfo_displaytypes_legendary">Legendary</string>
-    <string name="iteminfo_displaytypes_extraordinary">Extraordinary</string>
-    <string name="iteminfo_displaytypes_rare">Rare</string>
-	
+	<string name="iteminfo_displaytypes_ordinary">Ordinary</string>
+	<string name="iteminfo_displaytypes_quest">Quest item</string>
+	<string name="iteminfo_displaytypes_legendary">Legendary</string>
+	<string name="iteminfo_displaytypes_extraordinary">Extraordinary</string>
+	<string name="iteminfo_displaytypes_rare">Rare</string>
+
 	<string name="actorconditioninfo_category">Condition category: %1$s</string>
-    <string name="actorcondition_categories_spiritual">Spiritual</string>
-    <string name="actorcondition_categories_mental">Mental</string>
-    <string name="actorcondition_categories_physical">Physical Capacity</string>
-    <string name="actorcondition_categories_blood">Blood Disorder</string>
-	
+	<string name="actorcondition_categories_spiritual">Spiritual</string>
+	<string name="actorcondition_categories_mental">Mental</string>
+	<string name="actorcondition_categories_physical">Physical Capacity</string>
+	<string name="actorcondition_categories_blood">Blood Disorder</string>
+
 	<string name="traitsinfo_base_max_hp">Max HP:</string>
 	<string name="traitsinfo_base_max_ap">Max AP:</string>
 	<string name="menu_save_saving_not_allowed_in_combat">Cannot save the game while in combat.</string>
-	
+
 	<string name="preferences_optimized_drawing_title">Optimized drawing</string>
 	<string name="preferences_optimized_drawing">Disable this if you see graphical artifacts. Enabling this option will make the game only redraw changed parts of the screen every frame.</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.6.11 -->
-	
+
 	<string name="skill_title_shadow_bless">Dark blessing of the Shadow</string>
-    <string name="skill_shortdescription_shadow_bless">Resistance against all types of conditions</string>
-    <string name="skill_longdescription_shadow_bless">Lowers the chance of being afflicted with all types of conditions by %1$d %%. This includes all types of conditions caused by monster attacks such as Poison, Dazed or Fatigue.</string>
-    
-    <string name="inventory_movetop">Move to top</string>
-    <string name="inventory_movebottom">Move to bottom</string>
-    <string name="actorinfo_immune_criticals">Immune to critical hits</string>
-    <string name="traitsinfo_criticalhit_effectivechance">Effective critical chance:</string>
+	<string name="skill_shortdescription_shadow_bless">Resistance against all types of conditions</string>
+	<string name="skill_longdescription_shadow_bless">Lowers the chance of being afflicted with all types of conditions by %1$d %%. This includes all types of conditions caused by monster attacks such as Poison, Dazed or Fatigue.</string>
 
-   	<string name="skill_title_crit1">Internal bleeding</string>
-    <string name="skill_shortdescription_crit1">Chance of internal bleeding</string>
-    <string name="skill_longdescription_crit1">For every critical hit made, there is a %1$d %% chance that the hit will cause internal bleeding on the target, effectively causing the \'Internal bleeding\' condition on the target. Internal bleeding severely lowers offensive combat abilities, making the target less able to land successful attacks.</string>
-   	<string name="skill_title_crit2">Fracture</string>
-    <string name="skill_shortdescription_crit2">Chance of bone fracture</string>
-    <string name="skill_longdescription_crit2">For every critical hit made, there is a %1$d %% chance that the hit will fracture some of the target\'s bones, effectively causing the \'Fracture\' condition on the target. This will severely lower the target\'s defensive combat abilities, making it less able to defend itself in subsequent attacks.</string>
-    <string name="skill_title_rejuvenation">Rejuvenation</string>
-    <string name="skill_shortdescription_rejuvenation">Chance of effect removal</string>
-    <string name="skill_longdescription_rejuvenation">Every round (6 seconds), there is a %1$d %% chance that one of the active negative actor conditions will be lowered by one magnitude. This applies to all temporary effect types that affect the body; mental conditions such as Dazed, physical capacity conditions such as Fatigue and also blood disorders such as poison.</string>
-   	<string name="skill_title_taunt">Taunt</string>
-    <string name="skill_shortdescription_taunt">Attacker loses AP on miss</string>
-    <string name="skill_longdescription_taunt">When an attacker makes an attack that misses, there is a %1$d %% chance that the attacker loses %2$d action points (AP). This applies to all types of melee attacks against you.</string>
-   	<string name="skill_title_concussion">Concussion</string>
-    <string name="skill_shortdescription_concussion">Chance of concussion</string>
-    <string name="skill_longdescription_concussion">When making an attack on a target whose block chance (BC) is at least %1$d lower than your attack chance (AC), there is a %2$d %% chance that the hit will cause a concussion on the target. A concussion will severely lower the target\'s offensive combat abilities, making the target less able to land successful attacks.</string>
+	<string name="inventory_movetop">Move to top</string>
+	<string name="inventory_movebottom">Move to bottom</string>
+	<string name="actorinfo_immune_criticals">Immune to critical hits</string>
+	<string name="traitsinfo_criticalhit_effectivechance">Effective critical chance:</string>
 
-    <string name="about_button4">About</string>
+	<string name="skill_title_crit1">Internal bleeding</string>
+	<string name="skill_shortdescription_crit1">Chance of internal bleeding</string>
+	<string name="skill_longdescription_crit1">For every critical hit made, there is a %1$d %% chance that the hit will cause internal bleeding on the target, effectively causing the \'Internal bleeding\' condition on the target. Internal bleeding severely lowers offensive combat abilities, making the target less able to land successful attacks.</string>
+	<string name="skill_title_crit2">Fracture</string>
+	<string name="skill_shortdescription_crit2">Chance of bone fracture</string>
+	<string name="skill_longdescription_crit2">For every critical hit made, there is a %1$d %% chance that the hit will fracture some of the target\'s bones, effectively causing the \'Fracture\' condition on the target. This will severely lower the target\'s defensive combat abilities, making it less able to defend itself in subsequent attacks.</string>
+	<string name="skill_title_rejuvenation">Rejuvenation</string>
+	<string name="skill_shortdescription_rejuvenation">Chance of effect removal</string>
+	<string name="skill_longdescription_rejuvenation">Every round (6 seconds), there is a %1$d %% chance that one of the active negative actor conditions will be lowered by one magnitude. This applies to all temporary effect types that affect the body; mental conditions such as Dazed, physical capacity conditions such as Fatigue and also blood disorders such as poison.</string>
+	<string name="skill_title_taunt">Taunt</string>
+	<string name="skill_shortdescription_taunt">Attacker loses AP on miss</string>
+	<string name="skill_longdescription_taunt">When an attacker makes an attack that misses, there is a %1$d %% chance that the attacker loses %2$d action points (AP). This applies to all types of melee attacks against you.</string>
+	<string name="skill_title_concussion">Concussion</string>
+	<string name="skill_shortdescription_concussion">Chance of concussion</string>
+	<string name="skill_longdescription_concussion">When making an attack on a target whose block chance (BC) is at least %1$d lower than your attack chance (AC), there is a %2$d %% chance that the hit will cause a concussion on the target. A concussion will severely lower the target\'s offensive combat abilities, making the target less able to land successful attacks.</string>
+
+	<string name="about_button4">About</string>
 
 	<!-- =========================================== -->
 	<!-- Added in v0.6.12 -->
-	
-    <string name="preferences_ui_category">Interface</string>
-    <string name="preferences_ui_enable_animations_title">Enable animations</string>
-    <string name="preferences_ui_enable_animations">Show animations for various interface elements, such as the combat bar.</string>
-    <string name="menu_button_worldmap">Map</string>
-    <string name="menu_button_worldmap_failed">Map cannot be displayed.</string>
-    <string name="display_worldmap_not_available">The map cannot be displayed from this location.</string>
-    <string name="display_worldmap_title">Map</string>
-    
+
+	<string name="preferences_ui_category">Interface</string>
+	<string name="preferences_ui_enable_animations_title">Enable animations</string>
+	<string name="preferences_ui_enable_animations">Show animations for various interface elements, such as the combat bar.</string>
+	<string name="menu_button_worldmap">Map</string>
+	<string name="menu_button_worldmap_failed">Map cannot be displayed.</string>
+	<string name="display_worldmap_not_available">The map cannot be displayed from this location.</string>
+	<string name="display_worldmap_title">Map</string>
+
 	<string name="inventory_equip_offhand">Equip (offhand)</string>
-	
+
 	<string name="iteminfo_effect_weapon_attack_cost">Attack cost: %1$d AP</string>
 	<string name="iteminfo_effect_increase_attack_cost">Increases attack cost by %1$d AP</string>
 	<string name="iteminfo_effect_decrease_attack_cost">Lowers attack cost by %1$d AP</string>
@@ -498,25 +498,25 @@
 	<string name="iteminfo_effect_decrease_use_cost">Lowers AP cost of using items in combat by %1$d AP</string>
 	<string name="iteminfo_effect_increase_reequip_cost">Increases AP cost of equipping items in combat by %1$d AP</string>
 	<string name="iteminfo_effect_decrease_reequip_cost">Lowers AP cost of equipping items in combat by %1$d AP</string>
-	
-	<string name="loadsave_save_overwrite_confirmation_all">Are you sure you want to overwrite this savegame?</string> 
+
+	<string name="loadsave_save_overwrite_confirmation_all">Are you sure you want to overwrite this savegame?</string>
 	<string name="loadsave_save_overwrite_confirmation_slot">(slot %1$d)</string>
-    <string name="preferences_display_overwrite_savegame_entries_always_confirm">Always show confirmation dialog box</string>
-    <string name="preferences_display_overwrite_savegame_entries_confirm_overwrite">Only show when overwriting a different playername</string>
-    <string name="preferences_display_overwrite_savegame_entries_never_confirm">Never display confirmation dialog box</string>
-    <string name="preferences_dialog_overwrite_savegame_title">Confirm overwriting savegames</string>
+	<string name="preferences_display_overwrite_savegame_entries_always_confirm">Always show confirmation dialog box</string>
+	<string name="preferences_display_overwrite_savegame_entries_confirm_overwrite">Only show when overwriting a different playername</string>
+	<string name="preferences_display_overwrite_savegame_entries_never_confirm">Never display confirmation dialog box</string>
+	<string name="preferences_dialog_overwrite_savegame_title">Confirm overwriting savegames</string>
 	<string name="preferences_dialog_overwrite_savegame">Gives a question about whether you want to overwrite when saving to a savegame slot that already contains a savegame.</string>
-	
+
 	<!-- =========================================== -->
 	<!-- Added in v0.7.0 -->
-	
+
 	<string name="heroinfo_reequip_cost">Re-equip cost (AP):</string>
 	<string name="heroinfo_useitem_cost">Use item cost (AP):</string>
-    <string name="combat_result_monstermoved">%1$s moves.</string>
-    <string name="combat_log_title">Combat log</string>
+	<string name="combat_result_monstermoved">%1$s moves.</string>
+	<string name="combat_log_title">Combat log</string>
 	<string name="localize_resources_from_mo_filename"></string>
-    <string name="conversation_reward_quest_finished">[Quest completed: \"%1$s\"]</string>
-    <string name="conversation_reward_quest_updated">[Quest updated: \"%1$s\"]</string>
+	<string name="conversation_reward_quest_finished">[Quest completed: \"%1$s\"]</string>
+	<string name="conversation_reward_quest_updated">[Quest updated: \"%1$s\"]</string>
 
 	<string name="skill_title_weapon_prof_dagger">Dagger proficiency</string>
 	<string name="skill_title_weapon_prof_1hsword">One-handed sword proficiency</string>
@@ -534,7 +534,7 @@
 	<string name="skill_title_specialization_dualwield">Specialization: Dual wield</string>
 	<string name="skill_title_specialization_2hand">Specialization: Two-handed weapon</string>
 	<string name="skill_title_specialization_weapon_shield">Specialization: Weapon and shield</string>
-	
+
 	<string name="skill_shortdescription_weapon_prof_dagger">Better at fighting with daggers</string>
 	<string name="skill_shortdescription_weapon_prof_1hsword">Better at fighting with one-handed swords</string>
 	<string name="skill_shortdescription_weapon_prof_2hsword">Better at fighting with two-handed swords</string>
@@ -551,7 +551,7 @@
 	<string name="skill_shortdescription_specialization_dualwield">Expert at dual wielding</string>
 	<string name="skill_shortdescription_specialization_2hand">Expert at two-handed weapons</string>
 	<string name="skill_shortdescription_specialization_weapon_shield">Expert at fighting with weapon and shield</string>
-	
+
 	<string name="skill_longdescription_weapon_prof_dagger">For each skill level, increases attack chance when using daggers and shortswords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
 	<string name="skill_longdescription_weapon_prof_1hsword">For each skill level, increases attack chance of rapiers, longswords and broadswords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
 	<string name="skill_longdescription_weapon_prof_2hsword">For each skill level, increases attack chance of two-handed swords by %1$d %% of the item\'s base attack chance, increases block chance by %2$d %% of the item\'s base block chance, and increases critical skill by %3$d %% of the item\'s base critical skill.</string>
@@ -579,30 +579,30 @@ Every skill level increases the attack chance of weapons with %1$d %% of their o
 	<string name="skill_longdescription_specialization_2hand">Increases damage potential of two-handed weapons by an additional %1$d %% of the original damage potential, in addition to the benefits given by the weapon style skill. The attack chances of two-handed weapons are also increased by %2$d %% of their original attack chances.</string>
 	<string name="skill_longdescription_specialization_weapon_shield">Increases both attack chances and damage potential of weapons. The attack chance is increased by %1$d %% of the original attack chance, and the damage potential is increased by %2$d %% of the original damage potential.</string>
 
-    <string name="preferences_quickslots_placement">Quickslot position</string>
-    <string name="preferences_quickslots_placement_summary">Where to place the quickslots</string>
-    <string name="preferences_quickslots_placements_horizontal_center_bottom">Center bottom</string>
-    <string name="preferences_quickslots_placements_vertical_center_left">Middle left</string>
-    <string name="preferences_quickslots_placements_vertical_center_right">Middle right</string>
-    <string name="preferences_quickslots_placements_vertical_bottom_left">Bottom left, along left border</string>
-    <string name="preferences_quickslots_placements_horizontal_bottom_left">Bottom left, along bottom border</string>
-    <string name="preferences_quickslots_placements_horizontal_bottom_right">Bottom right, along bottom border</string>
-    <string name="preferences_quickslots_placements_vertical_bottom_right">Bottom right, along right border</string>
-    <string name="preferences_ui_show_quickslots_when_toolbox_is_visible_title">Show quickslots when toolbox is opened</string>
-    <string name="preferences_ui_show_quickslots_when_toolbox_is_visible">Makes the quickslot buttons be displayed as soon as the toolbox is opened</string>
-    <string name="startscreen_incompatible_savegames">This is a development version of Andor\'s Trail. Savegames produced by this version are incompatible with the release version.</string>
-    <string name="startscreen_non_release_version">This is a prerelease version of Andor\'s Trail. Savegames produced by this version might not be compatible with the release version.</string>
-    <string name="heroinfo_gamestats">Game statistics</string>
-    <string name="heroinfo_gamestats_quests">Completed quests</string>
-    <string name="heroinfo_gamestats_deaths">Times fallen unconscious</string>
-    <string name="heroinfo_gamestats_spent_gold">Gold spent in shops</string>
-    <string name="heroinfo_gamestats_bonemeals">Bonemeal potions used</string>
-    <string name="heroinfo_gamestats_num_used_items">Items used</string>
-    <string name="heroinfo_gamestats_visited_maps">Places visited</string>
-    <string name="heroinfo_gamestats_fav_item">Most commonly used item</string>
-    <string name="heroinfo_gamestats_num_killed_monsters">Monsters killed</string>
-    <string name="heroinfo_gamestats_top_boss">Most powerful monster killed</string>
-    <string name="heroinfo_gamestats_fav_monsters">Most commonly killed monsters</string>
-    <string name="heroinfo_gamestats_name_and_qty">%1$s (%2$d)</string>
+	<string name="preferences_quickslots_placement">Quickslot position</string>
+	<string name="preferences_quickslots_placement_summary">Where to place the quickslots</string>
+	<string name="preferences_quickslots_placements_horizontal_center_bottom">Center bottom</string>
+	<string name="preferences_quickslots_placements_vertical_center_left">Middle left</string>
+	<string name="preferences_quickslots_placements_vertical_center_right">Middle right</string>
+	<string name="preferences_quickslots_placements_vertical_bottom_left">Bottom left, along left border</string>
+	<string name="preferences_quickslots_placements_horizontal_bottom_left">Bottom left, along bottom border</string>
+	<string name="preferences_quickslots_placements_horizontal_bottom_right">Bottom right, along bottom border</string>
+	<string name="preferences_quickslots_placements_vertical_bottom_right">Bottom right, along right border</string>
+	<string name="preferences_ui_show_quickslots_when_toolbox_is_visible_title">Show quickslots when toolbox is opened</string>
+	<string name="preferences_ui_show_quickslots_when_toolbox_is_visible">Makes the quickslot buttons be displayed as soon as the toolbox is opened</string>
+	<string name="startscreen_incompatible_savegames">This is a development version of Andor\'s Trail. Savegames produced by this version are incompatible with the release version.</string>
+	<string name="startscreen_non_release_version">This is a prerelease version of Andor\'s Trail. Savegames produced by this version might not be compatible with the release version.</string>
+	<string name="heroinfo_gamestats">Game statistics</string>
+	<string name="heroinfo_gamestats_quests">Completed quests</string>
+	<string name="heroinfo_gamestats_deaths">Times fallen unconscious</string>
+	<string name="heroinfo_gamestats_spent_gold">Gold spent in shops</string>
+	<string name="heroinfo_gamestats_bonemeals">Bonemeal potions used</string>
+	<string name="heroinfo_gamestats_num_used_items">Items used</string>
+	<string name="heroinfo_gamestats_visited_maps">Places visited</string>
+	<string name="heroinfo_gamestats_fav_item">Most commonly used item</string>
+	<string name="heroinfo_gamestats_num_killed_monsters">Monsters killed</string>
+	<string name="heroinfo_gamestats_top_boss">Most powerful monster killed</string>
+	<string name="heroinfo_gamestats_fav_monsters">Most commonly killed monsters</string>
+	<string name="heroinfo_gamestats_name_and_qty">%1$s (%2$d)</string>
 
 </resources>
diff --git a/AndorsTrail/res/values/strings_about.xml b/AndorsTrail/res/values/strings_about.xml
index 5f2c90d7b..f590f29f4 100644
--- a/AndorsTrail/res/values/strings_about.xml
+++ b/AndorsTrail/res/values/strings_about.xml
@@ -27,7 +27,7 @@
 <div><b>Attacking</b> - [3AP] *</div>
 <img alt="attacking" src="doubleattackexample.png" />
 <p>* (Equipping Gear &amp; Using Items may alter AP &amp; usage cost)</p>
-	
+
 <div><b>Using Items</b> - [5AP]</div>
 <div><b>Fleeing</b> - [6AP]</div>
 
diff --git a/AndorsTrail/res/values/styles.xml b/AndorsTrail/res/values/styles.xml
index a50055dbb..881cadcb1 100644
--- a/AndorsTrail/res/values/styles.xml
+++ b/AndorsTrail/res/values/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="actorinfo_sectionheader">
-        <item name="android:layout_marginTop">@dimen/section_margin</item>
-    </style>
+	<style name="actorinfo_sectionheader">
+		<item name="android:layout_marginTop">@dimen/section_margin</item>
+	</style>
 </resources>
\ No newline at end of file
diff --git a/AndorsTrail/res/values/ui_colors.xml b/AndorsTrail/res/values/ui_colors.xml
index 7caaee8cf..85dcc413e 100644
--- a/AndorsTrail/res/values/ui_colors.xml
+++ b/AndorsTrail/res/values/ui_colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-   <color name="translucent_black">#80000000</color>
-   <color name="displayworldmap_background">#423921</color>
+	<color name="translucent_black">#80000000</color>
+	<color name="displayworldmap_background">#423921</color>
 </resources>
diff --git a/AndorsTrail/res/values/ui_dimen.xml b/AndorsTrail/res/values/ui_dimen.xml
index 12dca72ca..322b4246c 100644
--- a/AndorsTrail/res/values/ui_dimen.xml
+++ b/AndorsTrail/res/values/ui_dimen.xml
@@ -3,23 +3,23 @@
 	<dimen name="smalltext">10sp</dimen>
 	<dimen name="smalltext_buttonheight">35sp</dimen>
 	<dimen name="titletext">20sp</dimen>
-	
+
 	<dimen name="healthbar_height">12sp</dimen>
 
 	<dimen name="dialog_margin">10sp</dimen>
-	
+
 	<dimen name="dialog_iconpadding_right">10sp</dimen>
 	<dimen name="dialog_iconpadding_bottom">10sp</dimen>
-	
+
 	<dimen name="boxshape_margin">5dp</dimen>
 	<dimen name="boxshape_width">100dp</dimen>
-	
+
 	<dimen name="section_margin">10dp</dimen>
-	
+
 	<dimen name="conversation_statementpadding">5dp</dimen>
 	<dimen name="conversation_textsize">16sp</dimen>
-	
+
 	<dimen name="actionbar_text">12sp</dimen>
 	<dimen name="statusbar_text">11sp</dimen>
-	
+
 </resources>
diff --git a/AndorsTrail/res/values/ui_ids.xml b/AndorsTrail/res/values/ui_ids.xml
index 522234faa..fbf3bca02 100644
--- a/AndorsTrail/res/values/ui_ids.xml
+++ b/AndorsTrail/res/values/ui_ids.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item type="id" name="quick_menu_assign"></item>
-    <item type="id" name="quick_menu_assign_group"></item>
-    <item type="id" name="quick_menu_unassign"></item>
+	<item type="id" name="quick_menu_assign"></item>
+	<item type="id" name="quick_menu_assign_group"></item>
+	<item type="id" name="quick_menu_unassign"></item>
 </resources>
diff --git a/AndorsTrail/res/values/ui_listviewstyle.xml b/AndorsTrail/res/values/ui_listviewstyle.xml
index 99af513bc..d87c65154 100644
--- a/AndorsTrail/res/values/ui_listviewstyle.xml
+++ b/AndorsTrail/res/values/ui_listviewstyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ConversationListView" parent="@android:style/Widget.ListView">
-    	<!-- Not used here. Overridden in values-v10/ -->
+	<style name="ConversationListView" parent="@android:style/Widget.ListView">
+		<!-- Not used here. Overridden in values-v10/ -->
 	</style>
 </resources>
diff --git a/AndorsTrail/res/values/ui_styles.xml b/AndorsTrail/res/values/ui_styles.xml
index 287b6faa9..3aaf5ab3f 100644
--- a/AndorsTrail/res/values/ui_styles.xml
+++ b/AndorsTrail/res/values/ui_styles.xml
@@ -3,52 +3,52 @@
 	<style name="Theme.NoBackground" parent="android:Theme">
 		<item name="android:windowBackground">@null</item>
 	</style>
-	
+
 	<style name="textWithIcon" parent="android:Widget.TextView">
 		<item name="android:drawablePadding">@dimen/dialog_iconpadding_right</item>
 		<item name="android:gravity">center_vertical</item>
 	</style>
-	
+
 	<style name="titleWithIcon" parent="@style/textWithIcon">
 		<item name="android:textSize">@dimen/titletext</item>
 		<item name="android:paddingBottom">@dimen/dialog_iconpadding_bottom</item>
 	</style>
-	
-    <style name="statsBoxStyle" parent="android:Widget.TextView">
-        <item name="android:background">@drawable/ui_boxshape</item>
-        <item name="android:drawablePadding">@dimen/boxshape_margin</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:layout_margin">@dimen/boxshape_margin</item>
-        <item name="android:padding">@dimen/boxshape_margin</item>
-        <item name="android:textSize">@dimen/smalltext</item>
-    </style>
-    
+
+	<style name="statsBoxStyle" parent="android:Widget.TextView">
+		<item name="android:background">@drawable/ui_boxshape</item>
+		<item name="android:drawablePadding">@dimen/boxshape_margin</item>
+		<item name="android:gravity">center_vertical</item>
+		<item name="android:layout_margin">@dimen/boxshape_margin</item>
+		<item name="android:padding">@dimen/boxshape_margin</item>
+		<item name="android:textSize">@dimen/smalltext</item>
+	</style>
+
 	<style name="quickButton">
-        <item name="android:longClickable">true</item>
-        <item name="android:textSize">@dimen/actionbar_text</item>
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">@dimen/smalltext_buttonheight</item>
-    </style>
-    
+		<item name="android:longClickable">true</item>
+		<item name="android:textSize">@dimen/actionbar_text</item>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">@dimen/smalltext_buttonheight</item>
+	</style>
+
 	<style name="toolboxButtonTile">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+	</style>
 
-    <style name="toolboxButtonDrawable">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:padding">0dp</item>
-    </style>
-    
-    <style name="traitsinfo_label" parent="android:Widget.TextView">
-        <item name="android:layout_marginRight">10sp</item>
-    </style>
+	<style name="toolboxButtonDrawable">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:padding">0dp</item>
+	</style>
 
-    <style name="traitsinfo_2linelabel" parent="android:Widget.TextView">
-    </style>
+	<style name="traitsinfo_label" parent="android:Widget.TextView">
+		<item name="android:layout_marginRight">10sp</item>
+	</style>
 
-    <style name="traitsinfo_2linevalue" parent="android:Widget.TextView">
-        <item name="android:layout_marginLeft">30sp</item>
-    </style>
+	<style name="traitsinfo_2linelabel" parent="android:Widget.TextView">
+	</style>
+
+	<style name="traitsinfo_2linevalue" parent="android:Widget.TextView">
+		<item name="android:layout_marginLeft">30sp</item>
+	</style>
 </resources>
\ No newline at end of file
diff --git a/AndorsTrail/res/values/worldmap_template.xml b/AndorsTrail/res/values/worldmap_template.xml
index 7e3cd3213..c1e7dc103 100644
--- a/AndorsTrail/res/values/worldmap_template.xml
+++ b/AndorsTrail/res/values/worldmap_template.xml
@@ -38,7 +38,7 @@ if (params) {
 	var x = parseInt(pos[0])-{{offsetx}};
 	var y = parseInt(pos[1])-{{offsety}};
 	player.style.top = y + \"px\";
-	player.style.left = x + \"px\"; 
+	player.style.left = x + \"px\";
 	window.scrollTo(x-100, y-100);
 } else {
 	player.style.display = \"none\";
diff --git a/AndorsTrail/res/xml/preferences.xml b/AndorsTrail/res/xml/preferences.xml
index 4cce38e62..42e9301ed 100644
--- a/AndorsTrail/res/xml/preferences.xml
+++ b/AndorsTrail/res/xml/preferences.xml
@@ -86,17 +86,17 @@
 			android:defaultValue="true"
 			android:summary="@string/preferences_ui_enable_animations"
 			android:key="enableUiAnimations" />
-        <ListPreference
-            android:title="@string/preferences_quickslots_placement"
-            android:summary="@string/preferences_quickslots_placement_summary"
-            android:key="quickslots_placement"
-            android:defaultValue="0"
-            android:entries="@array/preferences_quickslots_placements"
-            android:entryValues="@array/preferences_quickslots_placements_values" />
-        <CheckBoxPreference
-            android:title="@string/preferences_ui_show_quickslots_when_toolbox_is_visible_title"
-            android:defaultValue="false"
-            android:summary="@string/preferences_ui_show_quickslots_when_toolbox_is_visible"
-            android:key="showQuickslotsWhenToolboxIsVisible" />
-    </PreferenceCategory>
+		<ListPreference
+			android:title="@string/preferences_quickslots_placement"
+			android:summary="@string/preferences_quickslots_placement_summary"
+			android:key="quickslots_placement"
+			android:defaultValue="0"
+			android:entries="@array/preferences_quickslots_placements"
+			android:entryValues="@array/preferences_quickslots_placements_values" />
+		<CheckBoxPreference
+			android:title="@string/preferences_ui_show_quickslots_when_toolbox_is_visible_title"
+			android:defaultValue="false"
+			android:summary="@string/preferences_ui_show_quickslots_when_toolbox_is_visible"
+			android:key="showQuickslotsWhenToolboxIsVisible" />
+	</PreferenceCategory>
 </PreferenceScreen>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
index 31efb6aa2..12ec66f4a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java
@@ -1,54 +1,54 @@
-package com.gpl.rpg.AndorsTrail;
-
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-
-import android.app.Activity;
-import android.app.Application;
-import android.content.Context;
-import android.view.Window;
-import android.view.WindowManager;
-
-public final class AndorsTrailApplication extends Application {
-
-	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
-	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
-	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
-	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
-	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 38;
-	public static final String CURRENT_VERSION_DISPLAY = "0.7.0a5";
-	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
-
-	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
-	private final WorldContext world = new WorldContext();
-	private final ControllerContext controllers = new ControllerContext(this, world);
-	private final WorldSetup setup = new WorldSetup(world, controllers, this);
-	public WorldContext getWorld() { return world; }
-	public WorldSetup getWorldSetup() { return setup; }
-	public AndorsTrailPreferences getPreferences() { return preferences; }
-	public ControllerContext getControllerContext() { return controllers; }
-	
-	public static AndorsTrailApplication getApplicationFromActivity(Activity activity) {
-		return ((AndorsTrailApplication) activity.getApplication());
-	}
-	public static AndorsTrailApplication getApplicationFromActivityContext(Context context) {
-		return getApplicationFromActivity(getActivityFromActivityContext(context)); 
-	}
-    private static Activity getActivityFromActivityContext(Context context) {
-		return (Activity) context;
-	}
-	
-	public boolean isInitialized() { return world.model != null; }
-	
-	public void setWindowParameters(Activity activity) { 
-		activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
-		if (preferences.fullscreen) {
-			activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		} else {
-			activity.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-		}
-	}
-}
+package com.gpl.rpg.AndorsTrail;
+
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
+import android.view.Window;
+import android.view.WindowManager;
+
+public final class AndorsTrailApplication extends Application {
+
+	public static final boolean DEVELOPMENT_DEBUGRESOURCES = false;
+	public static final boolean DEVELOPMENT_FORCE_STARTNEWGAME = false;
+	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
+	public static final boolean DEVELOPMENT_DEBUGBUTTONS = false;
+	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
+	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
+	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? 999 : 38;
+	public static final String CURRENT_VERSION_DISPLAY = "0.7.0a5";
+	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
+
+	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
+	private final WorldContext world = new WorldContext();
+	private final ControllerContext controllers = new ControllerContext(this, world);
+	private final WorldSetup setup = new WorldSetup(world, controllers, this);
+	public WorldContext getWorld() { return world; }
+	public WorldSetup getWorldSetup() { return setup; }
+	public AndorsTrailPreferences getPreferences() { return preferences; }
+	public ControllerContext getControllerContext() { return controllers; }
+
+	public static AndorsTrailApplication getApplicationFromActivity(Activity activity) {
+		return ((AndorsTrailApplication) activity.getApplication());
+	}
+	public static AndorsTrailApplication getApplicationFromActivityContext(Context context) {
+		return getApplicationFromActivity(getActivityFromActivityContext(context));
+	}
+	private static Activity getActivityFromActivityContext(Context context) {
+		return (Activity) context;
+	}
+
+	public boolean isInitialized() { return world.model != null; }
+
+	public void setWindowParameters(Activity activity) {
+		activity.requestWindowFeature(Window.FEATURE_NO_TITLE);
+		if (preferences.fullscreen) {
+			activity.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		} else {
+			activity.getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
index 0eb344d3a..f4f607183 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java
@@ -1,94 +1,94 @@
-package com.gpl.rpg.AndorsTrail;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-public final class AndorsTrailPreferences {
-	public static final int DISPLAYLOOT_DIALOG_ALWAYS = 0;
-	public static final int DISPLAYLOOT_DIALOG_FOR_ITEMS = 3;
-	public static final int DISPLAYLOOT_DIALOG_FOR_ITEMS_ELSE_TOAST = 4;
-	public static final int DISPLAYLOOT_TOAST = 1;
-	public static final int DISPLAYLOOT_TOAST_FOR_ITEMS = 5;
-	public static final int DISPLAYLOOT_NONE = 2;
-	public static final int MOVEMENTMETHOD_STRAIGHT = 0;
-	public static final int MOVEMENTMETHOD_DIRECTIONAL = 1;
-	public static final int MOVEMENTAGGRESSIVENESS_NORMAL = 0;
-	public static final int MOVEMENTAGGRESSIVENESS_AGGRESSIVE = 1;
-	public static final int MOVEMENTAGGRESSIVENESS_DEFENSIVE = 2;
-	public static final int DPAD_POSITION_DISABLED = 0;
-	public static final int DPAD_POSITION_LOWER_RIGHT = 1;
-	public static final int DPAD_POSITION_LOWER_LEFT = 2;
-	public static final int DPAD_POSITION_LOWER_CENTER = 3;
-	public static final int DPAD_POSITION_CENTER_LEFT = 4;
-	public static final int DPAD_POSITION_CENTER_RIGHT = 5;
-	public static final int DPAD_POSITION_UPPER_LEFT = 6;
-	public static final int DPAD_POSITION_UPPER_RIGHT = 7;
-	public static final int DPAD_POSITION_UPPER_CENTER = 8;
-	public static final int CONFIRM_OVERWRITE_SAVEGAME_ALWAYS = 0;
-	public static final int CONFIRM_OVERWRITE_SAVEGAME_WHEN_PLAYERNAME_DIFFERS = 1;
-	public static final int CONFIRM_OVERWRITE_SAVEGAME_NEVER = 2;
-	public static final int QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM = 0;
-	public static final int QUICKSLOTS_POSITION_VERTICAL_CENTER_LEFT = 1;
-	public static final int QUICKSLOTS_POSITION_VERTICAL_CENTER_RIGHT = 2;
-	public static final int QUICKSLOTS_POSITION_VERTICAL_BOTTOM_LEFT = 3;
-	public static final int QUICKSLOTS_POSITION_HORIZONTAL_BOTTOM_LEFT = 4;
-	public static final int QUICKSLOTS_POSITION_HORIZONTAL_BOTTOM_RIGHT = 5;
-	public static final int QUICKSLOTS_POSITION_VERTICAL_BOTTOM_RIGHT = 6;
-
-	public boolean confirmRest = true;
-	public boolean confirmAttack = true;
-	public int displayLoot = DISPLAYLOOT_DIALOG_ALWAYS;
-	public boolean fullscreen = true;
-	public int attackspeed_milliseconds = 1000;
-	public int movementMethod = MOVEMENTMETHOD_STRAIGHT;
-	public int movementAggressiveness = MOVEMENTAGGRESSIVENESS_NORMAL;
-	public float scalingFactor = 1.0f;
-	public int dpadPosition;
-	public boolean dpadMinimizeable = true;
-	public boolean optimizedDrawing = false;
-	public boolean enableUiAnimations = true;
-	public int displayOverwriteSavegame = CONFIRM_OVERWRITE_SAVEGAME_ALWAYS;
-	public int quickslotsPosition = QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM;
-	public boolean showQuickslotsWhenToolboxIsVisible = false;
-	
-	public void read(final Context androidContext) {
-		AndorsTrailPreferences dest = this;
-		try {
-			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(androidContext);
-			dest.confirmRest = prefs.getBoolean("confirm_rest", true);
-			dest.confirmAttack = prefs.getBoolean("confirm_attack", true);
-			dest.displayLoot = Integer.parseInt(prefs.getString("display_lootdialog", Integer.toString(DISPLAYLOOT_DIALOG_ALWAYS)));
-			dest.fullscreen = prefs.getBoolean("fullscreen", true);
-			dest.attackspeed_milliseconds = Integer.parseInt(prefs.getString("attackspeed", "1000"));
-			dest.movementMethod = Integer.parseInt(prefs.getString("movementmethod", Integer.toString(MOVEMENTMETHOD_STRAIGHT)));
-			dest.scalingFactor = Float.parseFloat(prefs.getString("scaling_factor", "1.0f"));
-			dest.dpadPosition = Integer.parseInt(prefs.getString("dpadposition", Integer.toString(DPAD_POSITION_DISABLED)));
-			dest.dpadMinimizeable = prefs.getBoolean("dpadMinimizeable", true);
-			dest.optimizedDrawing = prefs.getBoolean("optimized_drawing", false);
-			dest.enableUiAnimations = prefs.getBoolean("enableUiAnimations", true);
-			dest.displayOverwriteSavegame = Integer.parseInt(prefs.getString("display_overwrite_savegame", Integer.toString(CONFIRM_OVERWRITE_SAVEGAME_ALWAYS)));
-			dest.quickslotsPosition = Integer.parseInt(prefs.getString("quickslots_placement", Integer.toString(QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM)));
-			dest.showQuickslotsWhenToolboxIsVisible = prefs.getBoolean("showQuickslotsWhenToolboxIsVisible", false);
-
-			// This might be implemented as a skill in the future.
-			//dest.movementAggressiveness = Integer.parseInt(prefs.getString("movementaggressiveness", Integer.toString(MOVEMENTAGGRESSIVENESS_NORMAL)));
-		} catch (Exception e) {
-			dest.confirmRest = true;
-			dest.confirmAttack = true;
-			dest.displayLoot = DISPLAYLOOT_DIALOG_ALWAYS;
-			dest.fullscreen = true;
-			dest.attackspeed_milliseconds = 1000;
-			dest.movementMethod = MOVEMENTMETHOD_STRAIGHT;
-			dest.movementAggressiveness = MOVEMENTAGGRESSIVENESS_NORMAL;
-			dest.scalingFactor = 1.0f;
-			dest.dpadPosition = DPAD_POSITION_DISABLED;
-			dest.dpadMinimizeable = true;
-			dest.optimizedDrawing = false;
-			dest.enableUiAnimations = true;
-			dest.displayOverwriteSavegame = CONFIRM_OVERWRITE_SAVEGAME_ALWAYS;
-			dest.quickslotsPosition = QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM;
-			dest.showQuickslotsWhenToolboxIsVisible = false;
-		}
-	}
-}
+package com.gpl.rpg.AndorsTrail;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public final class AndorsTrailPreferences {
+	public static final int DISPLAYLOOT_DIALOG_ALWAYS = 0;
+	public static final int DISPLAYLOOT_DIALOG_FOR_ITEMS = 3;
+	public static final int DISPLAYLOOT_DIALOG_FOR_ITEMS_ELSE_TOAST = 4;
+	public static final int DISPLAYLOOT_TOAST = 1;
+	public static final int DISPLAYLOOT_TOAST_FOR_ITEMS = 5;
+	public static final int DISPLAYLOOT_NONE = 2;
+	public static final int MOVEMENTMETHOD_STRAIGHT = 0;
+	public static final int MOVEMENTMETHOD_DIRECTIONAL = 1;
+	public static final int MOVEMENTAGGRESSIVENESS_NORMAL = 0;
+	public static final int MOVEMENTAGGRESSIVENESS_AGGRESSIVE = 1;
+	public static final int MOVEMENTAGGRESSIVENESS_DEFENSIVE = 2;
+	public static final int DPAD_POSITION_DISABLED = 0;
+	public static final int DPAD_POSITION_LOWER_RIGHT = 1;
+	public static final int DPAD_POSITION_LOWER_LEFT = 2;
+	public static final int DPAD_POSITION_LOWER_CENTER = 3;
+	public static final int DPAD_POSITION_CENTER_LEFT = 4;
+	public static final int DPAD_POSITION_CENTER_RIGHT = 5;
+	public static final int DPAD_POSITION_UPPER_LEFT = 6;
+	public static final int DPAD_POSITION_UPPER_RIGHT = 7;
+	public static final int DPAD_POSITION_UPPER_CENTER = 8;
+	public static final int CONFIRM_OVERWRITE_SAVEGAME_ALWAYS = 0;
+	public static final int CONFIRM_OVERWRITE_SAVEGAME_WHEN_PLAYERNAME_DIFFERS = 1;
+	public static final int CONFIRM_OVERWRITE_SAVEGAME_NEVER = 2;
+	public static final int QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM = 0;
+	public static final int QUICKSLOTS_POSITION_VERTICAL_CENTER_LEFT = 1;
+	public static final int QUICKSLOTS_POSITION_VERTICAL_CENTER_RIGHT = 2;
+	public static final int QUICKSLOTS_POSITION_VERTICAL_BOTTOM_LEFT = 3;
+	public static final int QUICKSLOTS_POSITION_HORIZONTAL_BOTTOM_LEFT = 4;
+	public static final int QUICKSLOTS_POSITION_HORIZONTAL_BOTTOM_RIGHT = 5;
+	public static final int QUICKSLOTS_POSITION_VERTICAL_BOTTOM_RIGHT = 6;
+
+	public boolean confirmRest = true;
+	public boolean confirmAttack = true;
+	public int displayLoot = DISPLAYLOOT_DIALOG_ALWAYS;
+	public boolean fullscreen = true;
+	public int attackspeed_milliseconds = 1000;
+	public int movementMethod = MOVEMENTMETHOD_STRAIGHT;
+	public int movementAggressiveness = MOVEMENTAGGRESSIVENESS_NORMAL;
+	public float scalingFactor = 1.0f;
+	public int dpadPosition;
+	public boolean dpadMinimizeable = true;
+	public boolean optimizedDrawing = false;
+	public boolean enableUiAnimations = true;
+	public int displayOverwriteSavegame = CONFIRM_OVERWRITE_SAVEGAME_ALWAYS;
+	public int quickslotsPosition = QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM;
+	public boolean showQuickslotsWhenToolboxIsVisible = false;
+
+	public void read(final Context androidContext) {
+		AndorsTrailPreferences dest = this;
+		try {
+			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(androidContext);
+			dest.confirmRest = prefs.getBoolean("confirm_rest", true);
+			dest.confirmAttack = prefs.getBoolean("confirm_attack", true);
+			dest.displayLoot = Integer.parseInt(prefs.getString("display_lootdialog", Integer.toString(DISPLAYLOOT_DIALOG_ALWAYS)));
+			dest.fullscreen = prefs.getBoolean("fullscreen", true);
+			dest.attackspeed_milliseconds = Integer.parseInt(prefs.getString("attackspeed", "1000"));
+			dest.movementMethod = Integer.parseInt(prefs.getString("movementmethod", Integer.toString(MOVEMENTMETHOD_STRAIGHT)));
+			dest.scalingFactor = Float.parseFloat(prefs.getString("scaling_factor", "1.0f"));
+			dest.dpadPosition = Integer.parseInt(prefs.getString("dpadposition", Integer.toString(DPAD_POSITION_DISABLED)));
+			dest.dpadMinimizeable = prefs.getBoolean("dpadMinimizeable", true);
+			dest.optimizedDrawing = prefs.getBoolean("optimized_drawing", false);
+			dest.enableUiAnimations = prefs.getBoolean("enableUiAnimations", true);
+			dest.displayOverwriteSavegame = Integer.parseInt(prefs.getString("display_overwrite_savegame", Integer.toString(CONFIRM_OVERWRITE_SAVEGAME_ALWAYS)));
+			dest.quickslotsPosition = Integer.parseInt(prefs.getString("quickslots_placement", Integer.toString(QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM)));
+			dest.showQuickslotsWhenToolboxIsVisible = prefs.getBoolean("showQuickslotsWhenToolboxIsVisible", false);
+
+			// This might be implemented as a skill in the future.
+			//dest.movementAggressiveness = Integer.parseInt(prefs.getString("movementaggressiveness", Integer.toString(MOVEMENTAGGRESSIVENESS_NORMAL)));
+		} catch (Exception e) {
+			dest.confirmRest = true;
+			dest.confirmAttack = true;
+			dest.displayLoot = DISPLAYLOOT_DIALOG_ALWAYS;
+			dest.fullscreen = true;
+			dest.attackspeed_milliseconds = 1000;
+			dest.movementMethod = MOVEMENTMETHOD_STRAIGHT;
+			dest.movementAggressiveness = MOVEMENTAGGRESSIVENESS_NORMAL;
+			dest.scalingFactor = 1.0f;
+			dest.dpadPosition = DPAD_POSITION_DISABLED;
+			dest.dpadMinimizeable = true;
+			dest.optimizedDrawing = false;
+			dest.enableUiAnimations = true;
+			dest.displayOverwriteSavegame = CONFIRM_OVERWRITE_SAVEGAME_ALWAYS;
+			dest.quickslotsPosition = QUICKSLOTS_POSITION_HORIZONTAL_CENTER_BOTTOM;
+			dest.showQuickslotsWhenToolboxIsVisible = false;
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
index 9c9913cf9..345760ef2 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/Dialogs.java
@@ -34,13 +34,13 @@ import java.util.Collection;
 import java.util.Collections;
 
 public final class Dialogs {
-	
+
 	private static void showDialogAndPause(Dialog d, final ControllerContext context) {
 		showDialogAndPause(d, context, null);
 	}
 	private static void showDialogAndPause(Dialog d, final ControllerContext context, final OnDismissListener onDismiss) {
 		context.gameRoundController.pause();
-    	d.setOnDismissListener(new OnDismissListener() {
+		d.setOnDismissListener(new OnDismissListener() {
 			@Override
 			public void onDismiss(DialogInterface arg0) {
 				if (onDismiss != null) onDismiss.onDismiss(arg0);
@@ -53,11 +53,11 @@ public final class Dialogs {
 	public static void showKeyArea(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
 		showConversation(currentActivity, context, phraseID, null);
 	}
-	
+
 	public static void showMapSign(final MainActivity currentActivity, final ControllerContext context, String phraseID) {
 		showConversation(currentActivity, context, phraseID, null);
 	}
-	
+
 	public static void showConversation(final MainActivity currentActivity, final ControllerContext context, final String phraseID, final Monster npc) {
 		context.gameRoundController.pause();
 		Intent intent = new Intent(currentActivity, ConversationActivity.class);
@@ -67,15 +67,15 @@ public final class Dialogs {
 	}
 
 	public static void addMonsterIdentifiers(Intent intent, Monster monster) {
-        if (monster == null) return;
-        intent.putExtra("x", monster.position.x);
-        intent.putExtra("y", monster.position.y);
+		if (monster == null) return;
+		intent.putExtra("x", monster.position.x);
+		intent.putExtra("y", monster.position.y);
 	}
 	public static void addMonsterIdentifiers(Bundle bundle, Monster monster) {
-        if (monster == null) return;
-        bundle.putInt("x", monster.position.x);
-        bundle.putInt("y", monster.position.y);
-    }
+		if (monster == null) return;
+		bundle.putInt("x", monster.position.x);
+		bundle.putInt("y", monster.position.y);
+	}
 
 	public static Monster getMonsterFromIntent(Intent intent, final WorldContext world) {
 		return getMonsterFromBundle(intent.getExtras(), world);
@@ -84,10 +84,10 @@ public final class Dialogs {
 		if (params == null) return null;
 		if (!params.containsKey("x")) return null;
 		int x = params.getInt("x");
-        int y = params.getInt("y");
-        return world.model.currentMap.getMonsterAt(x, y);
+		int y = params.getInt("y");
+		return world.model.currentMap.getMonsterAt(x, y);
 	}
-	
+
 	public static void showMonsterEncounter(final MainActivity currentActivity, final ControllerContext context, final Monster monster) {
 		context.gameRoundController.pause();
 		Intent intent = new Intent(currentActivity, MonsterEncounterActivity.class);
@@ -102,7 +102,7 @@ public final class Dialogs {
 		addMonsterIdentifiers(intent, monster);
 		context.startActivity(intent);
 	}
-	
+
 	public static String getGroundLootFoundMessage(final Context ctx, final Loot loot) {
 		StringBuilder sb = new StringBuilder(60);
 		if (!loot.items.isEmpty()) {
@@ -152,7 +152,7 @@ public final class Dialogs {
 			sb.append(ctx.getString(R.string.dialog_loot_pickedupitems, numItems));
 		}
 	}
-	
+
 	public static void showMonsterLoot(final MainActivity mainActivity, final ControllerContext controllers, final WorldContext world, final Collection<Loot> lootBags, final Loot combinedLoot, final String msg) {
 		// CombatController will do killedMonsterBags.clear() after this method has been called,
 		// so we need to keep the list of objects. Therefore, we create a shallow copy of the list of bags.
@@ -163,7 +163,7 @@ public final class Dialogs {
 	public static void showGroundLoot(final MainActivity mainActivity, final ControllerContext controllers, final WorldContext world, final Loot loot, final String msg) {
 		showLoot(mainActivity, controllers, world, loot, Collections.singletonList(loot), R.string.dialog_groundloot_title, msg);
  	}
-	
+
 	private static void showLoot(final MainActivity mainActivity, final ControllerContext controllers, final WorldContext world, final Loot combinedLoot, final Iterable<Loot> lootBags, final int title, final String msg) {
 		final ListView itemList = new ListView(mainActivity);
 		itemList.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
@@ -171,7 +171,7 @@ public final class Dialogs {
 		itemList.setOnItemClickListener(new OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-				
+
 				final String itemTypeID = ((ItemContainerAdapter) parent.getAdapter()).getItem(position).itemType.id;
 				boolean removeFromCombinedLoot = true;
 				for (Loot l : lootBags) {
@@ -188,25 +188,25 @@ public final class Dialogs {
 			}
 		});
 		itemList.setAdapter(new ItemContainerAdapter(mainActivity, world.tileManager, combinedLoot.items, world.model.player));
-		
+
 		AlertDialog.Builder db = new AlertDialog.Builder(mainActivity)
-        .setTitle(title)
-        .setMessage(msg)
-        .setIcon(new BitmapDrawable(mainActivity.getResources(), world.tileManager.preloadedTiles.getBitmap(TileManager.iconID_groundbag)))
-        .setNegativeButton(R.string.dialog_close, null)
-        .setView(itemList);
-		
+		.setTitle(title)
+		.setMessage(msg)
+		.setIcon(new BitmapDrawable(mainActivity.getResources(), world.tileManager.preloadedTiles.getBitmap(TileManager.iconID_groundbag)))
+		.setNegativeButton(R.string.dialog_close, null)
+		.setView(itemList);
+
 		if (!combinedLoot.items.isEmpty()) {
 			db.setPositiveButton(R.string.dialog_loot_pickall, new DialogInterface.OnClickListener() {
-	            @Override
-	            public void onClick(DialogInterface dialog, int which) {
-	            	controllers.itemController.pickupAll(lootBags);
-	            }
-	        });
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					controllers.itemController.pickupAll(lootBags);
+				}
+			});
 		}
-		
+
 		final Dialog d = db.create();
-		
+
 		showDialogAndPause(d, controllers, new OnDismissListener() {
 			@Override
 			public void onDismiss(DialogInterface arg0) {
@@ -233,74 +233,74 @@ public final class Dialogs {
 
 	public static void showConfirmRest(final Activity currentActivity, final ControllerContext controllerContext, final MapObject area) {
 		Dialog d = new AlertDialog.Builder(currentActivity)
-        .setTitle(R.string.dialog_rest_title)
-        .setMessage(R.string.dialog_rest_confirm_message)
-        .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-            	controllerContext.mapController.rest(area);
-            }
-        })
-        .setNegativeButton(android.R.string.no, null)
-        .create();
+		.setTitle(R.string.dialog_rest_title)
+		.setMessage(R.string.dialog_rest_confirm_message)
+		.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				controllerContext.mapController.rest(area);
+			}
+		})
+		.setNegativeButton(android.R.string.no, null)
+		.create();
 
-    	showDialogAndPause(d, controllerContext);
+		showDialogAndPause(d, controllerContext);
 	}
 	public static void showRested(final Activity currentActivity, final ControllerContext controllerContext) {
 		Dialog d = new AlertDialog.Builder(currentActivity)
-        .setTitle(R.string.dialog_rest_title)
-        .setMessage(R.string.dialog_rest_message)
-        .setNeutralButton(android.R.string.ok, null)
-        .create();
+		.setTitle(R.string.dialog_rest_title)
+		.setMessage(R.string.dialog_rest_message)
+		.setNeutralButton(android.R.string.ok, null)
+		.create();
 
-    	showDialogAndPause(d, controllerContext);
+		showDialogAndPause(d, controllerContext);
 	}
 
 	public static void showNewVersion(final Activity currentActivity) {
 		new AlertDialog.Builder(currentActivity)
-        .setTitle(R.string.dialog_newversion_title)
-        .setMessage(R.string.dialog_newversion_message)
-        .setNeutralButton(android.R.string.ok, null)
-        .show();
+		.setTitle(R.string.dialog_newversion_title)
+		.setMessage(R.string.dialog_newversion_message)
+		.setNeutralButton(android.R.string.ok, null)
+		.show();
 	}
-	
+
 	public static boolean showSave(final Activity mainActivity, final ControllerContext controllerContext, final WorldContext world) {
 		if (world.model.uiSelections.isInCombat) {
 			Toast.makeText(mainActivity, R.string.menu_save_saving_not_allowed_in_combat, Toast.LENGTH_SHORT).show();
 			return false;
 		}
 		controllerContext.gameRoundController.pause();
-    	Intent intent = new Intent(mainActivity, LoadSaveActivity.class);
-    	intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/save"));
-    	mainActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_SAVEGAME);
+		Intent intent = new Intent(mainActivity, LoadSaveActivity.class);
+		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/save"));
+		mainActivity.startActivityForResult(intent, MainActivity.INTENTREQUEST_SAVEGAME);
 		return true;
 	}
-	
+
 	public static void showLoad(final Activity currentActivity) {
 		Intent intent = new Intent(currentActivity, LoadSaveActivity.class);
 		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/load"));
 		currentActivity.startActivityForResult(intent, StartScreenActivity.INTENTREQUEST_LOADGAME);
 	}
-	
+
 	public static void showActorConditionInfo(final Context context, ActorConditionType conditionType) {
 		Intent intent = new Intent(context, ActorConditionInfoActivity.class);
 		intent.setData(Uri.parse("content://com.gpl.rpg.AndorsTrail/actorconditioninfo/" + conditionType.conditionTypeID));
 		context.startActivity(intent);
 	}
-	
+
 	public static Intent getIntentForBulkBuyingInterface(final Context ctx, String itemTypeID, int totalAvailableAmount) {
 		return getIntentForBulkSelectionInterface(ctx, itemTypeID, totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType.buy);
 	}
-	
+
 	public static Intent getIntentForBulkSellingInterface(final Context ctx, String itemTypeID, int totalAvailableAmount) {
 		return getIntentForBulkSelectionInterface(ctx, itemTypeID, totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType.sell);
 	}
-	
+
 	public static Intent getIntentForBulkDroppingInterface(final Context ctx, String itemTypeID, int totalAvailableAmount) {
 		return getIntentForBulkSelectionInterface(ctx, itemTypeID, totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType.drop);
 	}
 
-    private static Intent getIntentForBulkSelectionInterface(final Context ctx, String itemTypeID, int totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType interfaceType) {
+	private static Intent getIntentForBulkSelectionInterface(final Context ctx, String itemTypeID, int totalAvailableAmount, BulkSelectionInterface.BulkInterfaceType interfaceType) {
 		Intent intent = new Intent(ctx, BulkSelectionInterface.class);
 		intent.putExtra("itemTypeID", itemTypeID);
 		intent.putExtra("totalAvailableAmount", totalAvailableAmount);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/VisualEffectCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/VisualEffectCollection.java
index 70b6b8263..403489ffe 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/VisualEffectCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/VisualEffectCollection.java
@@ -18,7 +18,7 @@ public final class VisualEffectCollection {
 	}
 
 	private final VisualEffect[] effects = new VisualEffect[VisualEffectID.values().length];
-	
+
 	public void initialize(DynamicTileLoader loader) {
 		effects[VisualEffectID.redSplash.ordinal()] = createEffect(loader, R.drawable.effect_blood4, new ConstRange(14, 0), 400, Color.RED);
 		effects[VisualEffectID.blueSwirl.ordinal()] = createEffect(loader, R.drawable.effect_heal2, new ConstRange(16, 0), 400, Color.rgb(150, 150, 255));
@@ -48,7 +48,7 @@ public final class VisualEffectCollection {
 		public final int millisecondPerFrame;
 		public final int totalFrames;
 		public final int lastFrame;
-		
+
 		public VisualEffect(int[] frameIconIDs, int duration, int textColor) {
 			this.frameIconIDs = frameIconIDs;
 			this.duration = duration;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
index f7b428f5f..6264f9809 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/WorldSetup.java
@@ -13,7 +13,7 @@ import com.gpl.rpg.AndorsTrail.resource.ResourceLoader;
 import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 
 public final class WorldSetup {
-	
+
 	private final WorldContext world;
 	private final ControllerContext controllers;
 	private final WeakReference<Context> androidContext;
@@ -28,7 +28,7 @@ public final class WorldSetup {
 	public boolean isSceneReady = false;
 	public String newHeroName;
 	private int loadResult;
-	
+
 	public WorldSetup(WorldContext world, ControllerContext controllers, Context androidContext) {
 		this.world = world;
 		this.controllers = controllers;
@@ -45,19 +45,19 @@ public final class WorldSetup {
 			onResourcesLoadedListener = new WeakReference<WorldSetup.OnResourcesLoadedListener>(listener);
 		}
 	}
-	
+
 	public void startResourceLoader(final Resources r) {
 		if (isResourcesInitialized) return;
-		
+
 		synchronized (this) {
 			if (isInitializingResources) return;
 			isInitializingResources = true;
 		}
-		
+
 		(new AsyncTask<Void, Void, Void>() {
 			@Override
 			protected Void doInBackground(Void... arg0) {
-		        ResourceLoader.loadResources(world, r);
+				ResourceLoader.loadResources(world, r);
 				return null;
 			}
 
@@ -67,7 +67,7 @@ public final class WorldSetup {
 				synchronized (WorldSetup.this) {
 					isResourcesInitialized = true;
 					isInitializingResources = false;
-					
+
 					if (onResourcesLoadedListener == null) return;
 					WorldSetup.OnResourcesLoadedListener listener = onResourcesLoadedListener.get();
 					onResourcesLoadedListener = null;
@@ -75,9 +75,9 @@ public final class WorldSetup {
 					listener.onResourcesLoaded();
 				}
 			}
-        }).execute();
+		}).execute();
 	}
-	
+
 	public void startCharacterSetup(final OnSceneLoadedListener listener) {
 		synchronized (WorldSetup.this) {
 			this.onSceneLoadedListener = new WeakReference<OnSceneLoadedListener>(listener);
@@ -90,7 +90,7 @@ public final class WorldSetup {
 			if (this.onSceneLoadedListener.get() == listener) this.onSceneLoadedListener = null;
 		}
 	}
-	
+
 	private final Object onlyOneThreadAtATimeMayLoadSavegames = new Object();
 	private void startSceneLoader() {
 		isSceneReady = false;
@@ -98,7 +98,7 @@ public final class WorldSetup {
 		synchronized (WorldSetup.this) {
 			sceneLoaderId = thisLoaderId;
 		}
-		
+
 		(new AsyncTask<Void, Void, Void>() {
 			@Override
 			protected Void doInBackground(Void... arg0) {
@@ -112,7 +112,7 @@ public final class WorldSetup {
 					}
 					createNewCharacter = false;
 				}
-		    	return null;
+				return null;
 			}
 
 			@Override
@@ -121,12 +121,12 @@ public final class WorldSetup {
 				synchronized (WorldSetup.this) {
 					if (sceneLoaderId != thisLoaderId) return; // Some other thread has started after we started.
 					isSceneReady = true;
-					
+
 					if (onSceneLoadedListener == null) return;
 					OnSceneLoadedListener o = onSceneLoadedListener.get();
 					onSceneLoadedListener = null;
 					if (o == null) return;
-					
+
 					if (loadResult == Savegames.LOAD_RESULT_SUCCESS) {
 						o.onSceneLoaded();
 					} else {
@@ -134,30 +134,30 @@ public final class WorldSetup {
 					}
 				}
 			}
-        }).execute();
+		}).execute();
 	}
-	
+
 	private int continueWorld() {
 		Context ctx = androidContext.get();
 		return Savegames.loadWorld(world, controllers, ctx, loadFromSlot);
 	}
-	
+
 	private void createNewWorld() {
 		Context ctx = androidContext.get();
 		world.model = new ModelContainer();
 		world.model.player.initializeNewPlayer(world.itemTypes, world.dropLists, newHeroName);
-		
+
 		controllers.actorStatsController.recalculatePlayerStats(world.model.player);
 		controllers.movementController.respawnPlayer(ctx.getResources());
 		controllers.mapController.lotsOfTimePassed();
 	}
 
 
-    public interface OnSceneLoadedListener {
-    	void onSceneLoaded();
-    	void onSceneLoadFailed(int loadResult);
-    }
-    public interface OnResourcesLoadedListener {
-    	void onResourcesLoaded();
-    }
+	public interface OnSceneLoadedListener {
+		void onSceneLoaded();
+		void onSceneLoadFailed(int loadResult);
+	}
+	public interface OnResourcesLoadedListener {
+		void onResourcesLoaded();
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
index d41d5ffc8..de34fea2d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java
@@ -16,59 +16,59 @@ import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 
 public final class AboutActivity extends Activity implements ImageGetter {
-	
+
 	/** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        app.setWindowParameters(this);
-        
-        setContentView(R.layout.about);
-    	final Resources res = getResources();
-    	
-        final TextView tv = (TextView) findViewById(R.id.about_contents);
-        tv.setText(Html.fromHtml(res.getString(R.string.about_contents1)));
-        
-        Button b = (Button) findViewById(R.id.about_button1);
-        b.setOnClickListener(new OnClickListener() {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.about);
+		final Resources res = getResources();
+
+		final TextView tv = (TextView) findViewById(R.id.about_contents);
+		tv.setText(Html.fromHtml(res.getString(R.string.about_contents1)));
+
+		Button b = (Button) findViewById(R.id.about_button1);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				tv.setText(Html.fromHtml(res.getString(R.string.about_contents1)));
 			}
 		});
-        
-        
-        b = (Button) findViewById(R.id.about_button2);
-        b.setOnClickListener(new OnClickListener() {
+
+
+		b = (Button) findViewById(R.id.about_button2);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				tv.setText(Html.fromHtml(res.getString(R.string.about_authors)));
 			}
 		});
-        
-        b = (Button) findViewById(R.id.about_button3);
-        b.setOnClickListener(new OnClickListener() {
+
+		b = (Button) findViewById(R.id.about_button3);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				tv.setText(Html.fromHtml(res.getString(R.string.about_copyright) + res.getString(R.string.about_contents3)));
 			}
 		});
-        
-        b = (Button) findViewById(R.id.about_button4);
-        b.setOnClickListener(new OnClickListener() {
+
+		b = (Button) findViewById(R.id.about_button4);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				tv.setText(Html.fromHtml(res.getString(R.string.about_interface), AboutActivity.this, null));
 			}
 		});
-        
-        tv.setMovementMethod(LinkMovementMethod.getInstance());
-        
-        TextView t = (TextView) findViewById(R.id.about_version);
-        t.setText('v' + AndorsTrailApplication.CURRENT_VERSION_DISPLAY);
-    }
+
+		tv.setMovementMethod(LinkMovementMethod.getInstance());
+
+		TextView t = (TextView) findViewById(R.id.about_version);
+		t.setText('v' + AndorsTrailApplication.CURRENT_VERSION_DISPLAY);
+	}
 
 	@Override
 	public Drawable getDrawable(String s) {
@@ -83,7 +83,7 @@ public final class AboutActivity extends Activity implements ImageGetter {
 			Drawable r = res.getDrawable(R.drawable.char_hero);
 			r.setBounds(0, 0, r.getIntrinsicWidth(), r.getIntrinsicHeight()*4/5);
 			return r;
-		} 
+		}
 		if (s.equals("monster.png")) d = res.getDrawable(R.drawable.monsters_eye4);
 		else if (s.equals("flee_example.png")) d = res.getDrawable(R.drawable.ui_flee_example);
 		else if (s.equals("doubleattackexample.png")) d = res.getDrawable(R.drawable.ui_doubleattackexample);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
index 9807faaf0..e58a3d9e1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java
@@ -20,69 +20,69 @@ import com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse;
 public final class ActorConditionInfoActivity extends Activity {
 
 	@Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        final WorldContext world = app.getWorld();
-        
-        String conditionTypeID = getIntent().getData().getLastPathSegment();
-        ActorConditionType conditionType = world.actorConditionsTypes.getActorConditionType(conditionTypeID);
-        
-        setContentView(R.layout.actorconditioninfo);
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		final WorldContext world = app.getWorld();
 
-        
-        TextView tv = (TextView) findViewById(R.id.actorconditioninfo_title);
-        tv.setText(conditionType.name);
-        world.tileManager.setImageViewTile(getResources(), tv, conditionType);
-        
-        Button b = (Button) findViewById(R.id.actorconditioninfo_close);
-        b.setOnClickListener(new OnClickListener() {
+		String conditionTypeID = getIntent().getData().getLastPathSegment();
+		ActorConditionType conditionType = world.actorConditionsTypes.getActorConditionType(conditionTypeID);
+
+		setContentView(R.layout.actorconditioninfo);
+
+
+		TextView tv = (TextView) findViewById(R.id.actorconditioninfo_title);
+		tv.setText(conditionType.name);
+		world.tileManager.setImageViewTile(getResources(), tv, conditionType);
+
+		Button b = (Button) findViewById(R.id.actorconditioninfo_close);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				ActorConditionInfoActivity.this.finish();
 			}
 		});
 
-        update(conditionType);
-    }
+		update(conditionType);
+	}
 
 	private void update(ActorConditionType conditionType) {
-        final Resources res = getResources();
-        LinearLayout lv;
-        TextView tv;
-        
-        tv = (TextView) findViewById(R.id.actorconditioninfo_category);
-        final String categoryName = res.getString(getConditionCategoryNameResId(conditionType.conditionCategory));
-        tv.setText(res.getString(R.string.actorconditioninfo_category, categoryName));
-        
-        ((AbilityModifierInfoView) findViewById(R.id.actorconditioninfo_constant_effect_abilitymodifierinfo)).update(conditionType.abilityEffect, false);
-                
-        tv = (TextView) findViewById(R.id.actorconditioninfo_constant_effect_title);
-        if (conditionType.abilityEffect != null) {
-        	tv.setVisibility(View.VISIBLE);
-        } else {
-        	tv.setVisibility(View.GONE);
-        }
-        
-        tv = (TextView) findViewById(R.id.actorconditioninfo_everyround_title);
-        if (conditionType.statsEffect_everyRound != null) {
-        	tv.setVisibility(View.VISIBLE);
-        	lv = (LinearLayout) findViewById(R.id.actorconditioninfo_everyround_list);
-        	ItemEffectsView_OnUse.describeStatsModifierTraits(conditionType.statsEffect_everyRound, this, res, lv);
-        } else {
-        	tv.setVisibility(View.GONE);
-        }
-        
-        tv = (TextView) findViewById(R.id.actorconditioninfo_everyfullround_title);
-        if (conditionType.statsEffect_everyFullRound != null) {
-        	tv.setVisibility(View.VISIBLE);
-        	lv = (LinearLayout) findViewById(R.id.actorconditioninfo_everyfullround_list);
-        	ItemEffectsView_OnUse.describeStatsModifierTraits(conditionType.statsEffect_everyFullRound, this, res, lv);
-        } else {
-        	tv.setVisibility(View.GONE);
-        }
+		final Resources res = getResources();
+		LinearLayout lv;
+		TextView tv;
+
+		tv = (TextView) findViewById(R.id.actorconditioninfo_category);
+		final String categoryName = res.getString(getConditionCategoryNameResId(conditionType.conditionCategory));
+		tv.setText(res.getString(R.string.actorconditioninfo_category, categoryName));
+
+		((AbilityModifierInfoView) findViewById(R.id.actorconditioninfo_constant_effect_abilitymodifierinfo)).update(conditionType.abilityEffect, false);
+
+		tv = (TextView) findViewById(R.id.actorconditioninfo_constant_effect_title);
+		if (conditionType.abilityEffect != null) {
+			tv.setVisibility(View.VISIBLE);
+		} else {
+			tv.setVisibility(View.GONE);
+		}
+
+		tv = (TextView) findViewById(R.id.actorconditioninfo_everyround_title);
+		if (conditionType.statsEffect_everyRound != null) {
+			tv.setVisibility(View.VISIBLE);
+			lv = (LinearLayout) findViewById(R.id.actorconditioninfo_everyround_list);
+			ItemEffectsView_OnUse.describeStatsModifierTraits(conditionType.statsEffect_everyRound, this, res, lv);
+		} else {
+			tv.setVisibility(View.GONE);
+		}
+
+		tv = (TextView) findViewById(R.id.actorconditioninfo_everyfullround_title);
+		if (conditionType.statsEffect_everyFullRound != null) {
+			tv.setVisibility(View.VISIBLE);
+			lv = (LinearLayout) findViewById(R.id.actorconditioninfo_everyfullround_list);
+			ItemEffectsView_OnUse.describeStatsModifierTraits(conditionType.statsEffect_everyFullRound, this, res, lv);
+		} else {
+			tv.setVisibility(View.GONE);
+		}
 	}
 
 	private int getConditionCategoryNameResId(ActorConditionType.ConditionCategory conditionCategory) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
index 544eaa39c..d6058eaab 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java
@@ -29,7 +29,7 @@ import com.gpl.rpg.AndorsTrail.model.item.ItemType;
  * Creates the BulkSelectionInterface dialog that allows for buy/drop/selling
  */
 public final class BulkSelectionInterface extends Activity implements TextWatcher {
-	
+
 	// class variables
 	public static enum BulkInterfaceType {
 		buy, sell, drop
@@ -37,8 +37,8 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 
 	private static final int BUTTON_REPEAT_FIRST_TIME = 300;		// Delay after the touch before the counting starts
 	private static final int BUTTON_REPEAT_FURTHER_TIMES = 50;		// Delay between two count events
-	private static final int BUTTON_REPEAT_DOUBLE_AFTER = 10;       // after how many count events the countValue doubles?
-		
+	private static final int BUTTON_REPEAT_DOUBLE_AFTER = 10;		// after how many count events the countValue doubles?
+
 	private WorldContext world;
 	private BulkInterfaceType interfaceType;
 	private ItemType itemType;
@@ -70,28 +70,28 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 	 * @param p_money - the total amount of money available - only necessary when buying
 	 */
 	@Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
-        this.world = app.getWorld();
-        app.setWindowParameters(this);
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		this.world = app.getWorld();
+		app.setWindowParameters(this);
 
-        final Resources res = getResources();
+		final Resources res = getResources();
 
-        final Intent intent = getIntent();
-        Bundle params = intent.getExtras();
-        String itemTypeID = params.getString("itemTypeID");
-        itemType = world.itemTypes.getItemType(itemTypeID);
-        totalAvailableAmount = params.getInt("totalAvailableAmount");
-        interfaceType = BulkInterfaceType.valueOf(params.getString("interfaceType"));
+		final Intent intent = getIntent();
+		Bundle params = intent.getExtras();
+		String itemTypeID = params.getString("itemTypeID");
+		itemType = world.itemTypes.getItemType(itemTypeID);
+		totalAvailableAmount = params.getInt("totalAvailableAmount");
+		interfaceType = BulkInterfaceType.valueOf(params.getString("interfaceType"));
 
 		int intialSelection = 1;
 
-        setContentView(R.layout.bulkselection);
+		setContentView(R.layout.bulkselection);
 
 		// initialize UI variables
-        TextView bulkselection_action_type = (TextView)findViewById(R.id.bulkselection_action_type);
+		TextView bulkselection_action_type = (TextView)findViewById(R.id.bulkselection_action_type);
 		bulkselection_amount_taken = (EditText)findViewById(R.id.bulkselection_amount_taken);
 		TextView bulkselection_amount_available = (TextView) findViewById(R.id.bulkselection_amount_available);
 		bulkselection_slider = (SeekBar)findViewById(R.id.bulkselection_slider);
@@ -104,29 +104,29 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 
 		// change image and name of the item
 		final TextView itemName = (TextView)findViewById(R.id.bulkselection_itemname);
-        itemName.setText(itemType.getName(world.model.player));
-        world.tileManager.setImageViewTileForSingleItemType(res, itemName, itemType);
+		itemName.setText(itemType.getName(world.model.player));
+		world.tileManager.setImageViewTileForSingleItemType(res, itemName, itemType);
 
-        int actionTextResourceID = 0;
+		int actionTextResourceID = 0;
 		if (interfaceType == BulkInterfaceType.buy) {
-        	pricePerUnit = ItemController.getBuyingPrice(world.model.player, itemType);
-        	actionTextResourceID = R.string.shop_buy;
-        } else if (interfaceType == BulkInterfaceType.sell) {
-        	pricePerUnit = ItemController.getSellingPrice(world.model.player, itemType);
-        	actionTextResourceID = R.string.shop_sell;
-        } else if (interfaceType == BulkInterfaceType.drop) {
-        	pricePerUnit = 0;
-        	actionTextResourceID = R.string.inventory_drop;
-        	bulkselection_summary_totalgold.setVisibility(View.GONE);
-        }
+			pricePerUnit = ItemController.getBuyingPrice(world.model.player, itemType);
+			actionTextResourceID = R.string.shop_buy;
+		} else if (interfaceType == BulkInterfaceType.sell) {
+			pricePerUnit = ItemController.getSellingPrice(world.model.player, itemType);
+			actionTextResourceID = R.string.shop_sell;
+		} else if (interfaceType == BulkInterfaceType.drop) {
+			pricePerUnit = 0;
+			actionTextResourceID = R.string.inventory_drop;
+			bulkselection_summary_totalgold.setVisibility(View.GONE);
+		}
 		String actionText = res.getString(actionTextResourceID);
-		
+
 		// initialize the visual components visuals
 		okButton.setText(actionText);
 		bulkselection_action_type.setText(actionText + ' ');
 		bulkselection_amount_available.setText(Integer.toString(totalAvailableAmount));
 		bulkselection_slider.setMax(totalAvailableAmount - 1);
-		
+
 		// hide Slider and Buttons when there is only 1 item available
 		if(totalAvailableAmount == 1){
 			decrementButton.setVisibility(View.GONE);
@@ -134,7 +134,7 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 			selectAllButton.setVisibility(View.GONE);
 			bulkselection_slider.setVisibility(View.GONE);
 		}
-		
+
 		updateControls(intialSelection);
 
 		OnTouchListener incrementDecrementListener = new OnTouchListener() {
@@ -149,20 +149,20 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 					break;
 				case MotionEvent.ACTION_UP:
 				case MotionEvent.ACTION_CANCEL:
-				case MotionEvent.ACTION_OUTSIDE: 
+				case MotionEvent.ACTION_OUTSIDE:
 					timedEventHandler.removeCallbacks(countEvent);
 					break;
 			}
 			return false;
 			}
 		};
-		
+
 		// setup decrement button
 		decrementButton.setOnTouchListener(incrementDecrementListener);
 
 		// setup increment button
 		incrementButton.setOnTouchListener(incrementDecrementListener);
-		
+
 		// setup EditText listeners
 		bulkselection_amount_taken.setOnKeyListener(new View.OnKeyListener() {
 			@Override
@@ -173,9 +173,9 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 				return false;
 			}
 		});
-		
+
 		bulkselection_amount_taken.addTextChangedListener(this);
-		
+
 		// setup slider event listeners
 		bulkselection_slider.setOnTouchListener(new View.OnTouchListener() {
 			@Override
@@ -184,7 +184,7 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 				return false;
 			}
 		});
-		
+
 		// setup OK button
 		okButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -192,19 +192,19 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 				if (requiresConfirmation()) {
 					final String displayType = ItemInfoActivity.getDisplayTypeString(res, itemType).toLowerCase();
 					final String message = res.getString(R.string.bulkselection_sell_confirmation, itemType.getName(world.model.player), displayType);
-					
+
 					new AlertDialog.Builder(v.getContext())
-				        .setIcon(android.R.drawable.ic_dialog_info)
-				        .setTitle(R.string.bulkselection_sell_confirmation_title)
-				        .setMessage(message)
-				        .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-				            @Override
-				            public void onClick(DialogInterface dialog, int which) {
-				            	itemsResult(intent);
+						.setIcon(android.R.drawable.ic_dialog_info)
+						.setTitle(R.string.bulkselection_sell_confirmation_title)
+						.setMessage(message)
+						.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+							@Override
+							public void onClick(DialogInterface dialog, int which) {
+								itemsResult(intent);
 							}
-							        })
-				        .setNegativeButton(android.R.string.no, null)
-				        .show();
+									})
+						.setNegativeButton(android.R.string.no, null)
+						.show();
 				} else {
 					itemsResult(intent);
 				}
@@ -216,7 +216,7 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 				return true;
 			}
 	 	});
-		
+
 		// setup cancel button
 		cancelButton.setOnClickListener(new View.OnClickListener() {
 			@Override
@@ -225,7 +225,7 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 				finish();
 			}
 		});
-		
+
 		selectAllButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -233,7 +233,7 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 			}
 		});
 	}
-	
+
 	private void itemsResult(Intent intent){
 		Intent result = new Intent();
 		result.putExtras(intent);
@@ -241,47 +241,47 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 		setResult(RESULT_OK, result);
 		BulkSelectionInterface.this.finish();
 	}
-	
+
 	private void incrementValueAndRepeat(int repeatAfterInterval) {
 		if(++countTime % BUTTON_REPEAT_DOUBLE_AFTER == 0) countValue *= 2;
 		int newAmount = getTextboxAmount() + countValue;
 		updateControls(newAmount);
-		if (newAmount <= 1 || newAmount >= totalAvailableAmount) return; // Do not repeat if we have reached the end of the scale. 
+		if (newAmount <= 1 || newAmount >= totalAvailableAmount) return; // Do not repeat if we have reached the end of the scale.
 		timedEventHandler.postDelayed(countEvent, repeatAfterInterval);
 	}
-	
+
 	private boolean canSelectFinalizeButton() {
 		int amount = getTextboxAmount();
 		if (amount <= 0) return false;
 		if (amount > totalAvailableAmount) return false;
-		
+
 		if (interfaceType == BulkInterfaceType.buy) {
 			if (amount * pricePerUnit > world.model.player.getGold()) return false;
 		}
-		
+
 		return true;
 	}
-	
+
 	// adjusts the amount to the possible interval / synchronizes changes between controls
 	private void updateControls(int newAmount) {
 		int oldSliderAmount = bulkselection_slider.getProgress() + 1;
 		int oldEditboxAmount = getTextboxAmount();
-		
+
 		// adjust amount
 		if (newAmount < 1) newAmount = 1;
 		if (newAmount > totalAvailableAmount) newAmount = totalAvailableAmount;
-		
+
 		// update controls
-		if (newAmount != oldEditboxAmount) bulkselection_amount_taken.setText(Integer.toString(newAmount)); // change the amount taken/text
-		if (newAmount != oldSliderAmount) bulkselection_slider.setProgress(newAmount - 1);                  // change the amount taken/text
+		if (newAmount != oldEditboxAmount) bulkselection_amount_taken.setText(Integer.toString(newAmount));	// change the amount taken/text
+		if (newAmount != oldSliderAmount) bulkselection_slider.setProgress(newAmount - 1);					// change the amount taken/text
 
 		// display buying/selling information if not dropping
 		if (interfaceType == BulkInterfaceType.buy) {
 			bulkselection_summary_totalgold.setText(getResources().getString(R.string.bulkselection_totalcost_buy, newAmount * pricePerUnit));
 		} else if (interfaceType == BulkInterfaceType.sell) {
 			bulkselection_summary_totalgold.setText(getResources().getString(R.string.bulkselection_totalcost_sell, newAmount * pricePerUnit));
-		} 
-		
+		}
+
 		okButton.setEnabled(canSelectFinalizeButton());
 	}
 
@@ -293,7 +293,7 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 		} catch (NumberFormatException e) {	}
 		return 0;
 	}
-	
+
 	@Override
 	public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) { }
 
@@ -305,5 +305,5 @@ public final class BulkSelectionInterface extends Activity implements TextWatche
 		if (bulkselection_amount_taken.getText().toString().equals("")) return;
 		int newAmount = getTextboxAmount();
 		updateControls(newAmount);
-    }
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index eee79c2e9..731ef2d10 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -53,7 +53,7 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 
 	private StatementContainerAdapter listAdapter;
 	private Button nextButton;
-    private ListView statementList;
+	private ListView statementList;
 	private RadioGroup replyGroup;
 	private OnCheckedChangeListener radioButtonListener;
 
@@ -98,9 +98,9 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 				nextButtonClicked();
 			}
 		});
-        nextButton.setEnabled(false);
+		nextButton.setEnabled(false);
 
-        statementList.setOnKeyListener(this);
+		statementList.setOnKeyListener(this);
 
 		statementList.setSelected(false);
 		statementList.setFocusable(false);
@@ -118,22 +118,22 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 			conversationState.proceedToPhrase(phraseID);
 		}
 	}
-    
-    @Override
+
+	@Override
 	protected void onResume() {
 		super.onResume();
-    	nextButton.requestFocus();
+		nextButton.requestFocus();
 	}
 
 	private int getSelectedReplyIndex() {
-    	for (int i = 0; i < replyGroup.getChildCount(); ++i) {
+		for (int i = 0; i < replyGroup.getChildCount(); ++i) {
 			final View v = replyGroup.getChildAt(i);
 			if (v == null) continue;
 			final RadioButton rb = (RadioButton) v;
 			if (rb.isChecked()) return i;
-    	}
-    	return -1;
-    }
+		}
+		return -1;
+	}
 
 	private void setSelectedReplyIndex(int i) {
 		int replyCount = replyGroup.getChildCount();
@@ -146,13 +146,13 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 		RadioButton rb = (RadioButton) v;
 		rb.setChecked(true);
 	}
- 
-    @Override
+
+	@Override
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		if (handleKeypress(keyCode, event)) return true;
 		else return super.onKeyDown(keyCode, event);
-    }
-    
+	}
+
 	@Override
 	public boolean onKey(View arg0, int keyCode, KeyEvent event) {
 		if (event.getAction() != KeyEvent.ACTION_DOWN) return false;
@@ -187,7 +187,7 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 		default: return false;
 		}
 	}
-	
+
 	private RadioButton getSelectedReplyButton() {
 		for (int i = 0; i < replyGroup.getChildCount(); ++i) {
 			final View v = replyGroup.getChildAt(i);
@@ -199,12 +199,12 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 		}
 		return null; // No reply was found. This is probably an error.
 	}
-	
+
 	private void nextButtonClicked() {
-        RadioButton rb = getSelectedReplyButton();
+		RadioButton rb = getSelectedReplyButton();
 		replyGroup.removeAllViews();
-        nextButton.setEnabled(false);
-        if (conversationState.hasOnlyOneNextReply()) {
+		nextButton.setEnabled(false);
+		if (conversationState.hasOnlyOneNextReply()) {
 			conversationState.playerSelectedNextStep();
 		} else {
 			if (rb == null) return;
@@ -215,40 +215,40 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 	}
 
 	private void addConversationStatement(Actor actor, String text, int textColor) {
-    	ConversationStatement s = new ConversationStatement();
-    	if (actor != null) {
-	    	s.iconID = actor.iconID;
-	    	s.actorName = actor.getName();
-    	} else {
-    		s.iconID = ConversationStatement.NO_ICON;
-    	}
-    	s.text = text;
+		ConversationStatement s = new ConversationStatement();
+		if (actor != null) {
+			s.iconID = actor.iconID;
+			s.actorName = actor.getName();
+		} else {
+			s.iconID = ConversationStatement.NO_ICON;
+		}
+		s.text = text;
 		s.nameColor = actor == player ? playerNameColor : NPCNameColor;
 		s.textColor = textColor;
-    	s.isPlayerActor = actor != null && actor == player;
-    	conversationHistory.add(s);
-    	statementList.clearFocus();
+		s.isPlayerActor = actor != null && actor == player;
+		conversationHistory.add(s);
+		statementList.clearFocus();
 		listAdapter.notifyDataSetChanged();
 		statementList.requestLayout();
 	}
-    
-    @Override
+
+	@Override
 	public void onSaveInstanceState(Bundle outState) {
-    	outState.putString("phraseID", conversationState.getCurrentPhraseID());
-    	outState.putParcelableArrayList("conversationHistory", conversationHistory);
+		outState.putString("phraseID", conversationState.getCurrentPhraseID());
+		outState.putParcelableArrayList("conversationHistory", conversationHistory);
 		Dialogs.addMonsterIdentifiers(outState, conversationState.getCurrentNPC());
-    }
+	}
 
 	private static final class ConversationStatement implements Parcelable {
 		public static final int NO_ICON = -1;
-		
+
 		public String actorName;
 		public String text;
 		public int iconID;
 		public int nameColor;
 		public int textColor;
 		public boolean isPlayerActor;
-		
+
 		public boolean hasActor() {
 			return iconID != NO_ICON;
 		}
@@ -265,35 +265,35 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 			dest.writeInt(textColor);
 			dest.writeByte((byte) (isPlayerActor ? 1 : 0));
 		}
-		
+
 		@SuppressWarnings("unused")
 		public static final Parcelable.Creator<ConversationStatement> CREATOR = new Parcelable.Creator<ConversationStatement>() {
-		    public ConversationStatement createFromParcel(Parcel in) {
-		    	ConversationStatement result = new ConversationStatement();
-		    	result.actorName = in.readString();
-		    	result.text = in.readString();
-		    	result.iconID = in.readInt();
-		    	result.nameColor = in.readInt();
+			public ConversationStatement createFromParcel(Parcel in) {
+				ConversationStatement result = new ConversationStatement();
+				result.actorName = in.readString();
+				result.text = in.readString();
+				result.iconID = in.readInt();
+				result.nameColor = in.readInt();
 				result.textColor = in.readInt();
-		    	result.isPlayerActor = in.readByte() == 1;
-		        return result;
-		    }
-		
-		    public ConversationStatement[] newArray(int size) {
-		        return new ConversationStatement[size];
-		    }
+				result.isPlayerActor = in.readByte() == 1;
+				return result;
+			}
+
+			public ConversationStatement[] newArray(int size) {
+				return new ConversationStatement[size];
+			}
 		};
 	}
 
-    private static final class StatementContainerAdapter extends ArrayAdapter<ConversationStatement> {
+	private static final class StatementContainerAdapter extends ArrayAdapter<ConversationStatement> {
+
+		private final TileManager tileManager;
 
-    	private final TileManager tileManager;
-    	
 		public StatementContainerAdapter(Context context, ArrayList<ConversationStatement> items, TileManager tileManager) {
 			super(context, 0, items);
 			this.tileManager = tileManager;
 		}
-		
+
 		@Override
 		public View getView(final int position, View convertView, ViewGroup parent) {
 			final ConversationStatement statement = getItem(position);
@@ -301,30 +301,30 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 			if (result == null) {
 				result = View.inflate(getContext(), R.layout.conversation_statement, null);
 			}
-			
+
 			final TextView tv = (TextView) result.findViewById(R.id.conversation_text);
-	        if (statement.hasActor()) {
-                final Resources res = getContext().getResources();
-                if (statement.isPlayerActor) tileManager.setImageViewTileForPlayer(res, tv, statement.iconID);
-	        	else tileManager.setImageViewTileForMonster(res, tv, statement.iconID);
-				
-	    		tv.setText(statement.actorName + ": " + statement.text, BufferType.SPANNABLE);
-		        Spannable sp = (Spannable) tv.getText();
-		        sp.setSpan(new ForegroundColorSpan(statement.nameColor), 0, statement.actorName.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+			if (statement.hasActor()) {
+				final Resources res = getContext().getResources();
+				if (statement.isPlayerActor) tileManager.setImageViewTileForPlayer(res, tv, statement.iconID);
+				else tileManager.setImageViewTileForMonster(res, tv, statement.iconID);
+
+				tv.setText(statement.actorName + ": " + statement.text, BufferType.SPANNABLE);
+				Spannable sp = (Spannable) tv.getText();
+				sp.setSpan(new ForegroundColorSpan(statement.nameColor), 0, statement.actorName.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 				if (statement.textColor != 0) {
 					sp.setSpan(new ForegroundColorSpan(statement.textColor), statement.actorName.length()+1, sp.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 				}
-	        } else {
-	        	tv.setCompoundDrawables(null, null, null, null);
-	    		if (statement.textColor == 0) {
+			} else {
+				tv.setCompoundDrawables(null, null, null, null);
+				if (statement.textColor == 0) {
 					tv.setText(statement.text);
 				} else {
 					tv.setText(statement.text, BufferType.SPANNABLE);
 					Spannable sp = (Spannable) tv.getText();
 					sp.setSpan(new ForegroundColorSpan(statement.textColor), 0, statement.text.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
 				}
-		    }
-			
+			}
+
 			return result;
 		}
 
@@ -337,7 +337,7 @@ public final class ConversationActivity extends Activity implements OnKeyListene
 		public boolean isEnabled(int position) {
 			return false;
 		}
-    }
+	}
 
 	@Override
 	public void onTextPhraseReached(String message, Actor actor) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
index 137f7e49e..741f35548 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java
@@ -22,7 +22,7 @@ public final class DebugInterface {
 	private final MainActivity mainActivity;
 	private final Resources res;
 	private final WorldContext world;
-	
+
 	public DebugInterface(ControllerContext controllers, WorldContext world, MainActivity mainActivity) {
 		this.controllerContext = controllers;
 		this.world = world;
@@ -32,150 +32,150 @@ public final class DebugInterface {
 
 	public void addDebugButtons() {
 		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
-    	
+
 		addDebugButtons(new DebugButton[] {
 			new DebugButton("dmg", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			world.model.player.damagePotential.set(99, 99);
-	    			world.model.player.attackChance = 200;
-	    			world.model.player.attackCost = 1;
-	    			showToast(mainActivity, "DEBUG: damagePotential=99, chance=200%, cost=1", Toast.LENGTH_SHORT);
+					world.model.player.damagePotential.set(99, 99);
+					world.model.player.attackChance = 200;
+					world.model.player.attackCost = 1;
+					showToast(mainActivity, "DEBUG: damagePotential=99, chance=200%, cost=1", Toast.LENGTH_SHORT);
 				}
 			})
 			/*,new DebugButton("dmg=1", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			world.model.player.traits.combatTraits.set(1, 1);
-	    			mainActivity.updateStatus();
-	    			showToast(mainActivity, "DEBUG: damagePotential=1", Toast.LENGTH_SHORT);
+					world.model.player.traits.combatTraits.set(1, 1);
+					mainActivity.updateStatus();
+					showToast(mainActivity, "DEBUG: damagePotential=1", Toast.LENGTH_SHORT);
 				}
 			})*/
 			/*,new DebugButton("items", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("elytharan_redeemer"));
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("ring_shadow0"));
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("shadow_slayer"));
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("pot_blind_rage"), 10);
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("clouded_rage"));
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("pot_fatigue_restore"), 20);
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("quickdagger1"));
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("bonemeal_potion"));
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("calomyran_secrets"));
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("tail_caverat"));
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("bwm_leather_cap"));
-	    			world.model.player.inventory.addItem(world.itemTypes.getItemType("chaosreaper"));
-	    			
-	    			mainActivity.updateStatus();
-	    			showToast(mainActivity, "DEBUG: added items", Toast.LENGTH_SHORT);
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("elytharan_redeemer"));
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("ring_shadow0"));
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("shadow_slayer"));
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("pot_blind_rage"), 10);
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("clouded_rage"));
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("pot_fatigue_restore"), 20);
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("quickdagger1"));
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("bonemeal_potion"));
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("calomyran_secrets"));
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("tail_caverat"));
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("bwm_leather_cap"));
+					world.model.player.inventory.addItem(world.itemTypes.getItemType("chaosreaper"));
+
+					mainActivity.updateStatus();
+					showToast(mainActivity, "DEBUG: added items", Toast.LENGTH_SHORT);
 				}
 			})*/
 			/*new DebugButton("skills++", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			int N = 1;
-	    			world.model.player.availableSkillIncreases += N * SkillCollection.NUM_SKILLS;
-	    			for(int j = 0; j < N; ++j) {
-		    			for(int i = 0; i < SkillCollection.NUM_SKILLS; ++i) {
-		    				world.model.player.addSkillLevel(i);
-		    			}
-	    			}
-	    			ActorStatsController.recalculatePlayerCombatTraits(world.model.player);
-	    			updateStatus();
-	    			showToast(mainActivity, "DEBUG: all skills raised " + N + " levels", Toast.LENGTH_SHORT);
+					int N = 1;
+					world.model.player.availableSkillIncreases += N * SkillCollection.NUM_SKILLS;
+					for(int j = 0; j < N; ++j) {
+						for(int i = 0; i < SkillCollection.NUM_SKILLS; ++i) {
+							world.model.player.addSkillLevel(i);
+						}
+					}
+					ActorStatsController.recalculatePlayerCombatTraits(world.model.player);
+					updateStatus();
+					showToast(mainActivity, "DEBUG: all skills raised " + N + " levels", Toast.LENGTH_SHORT);
 				}
 			})*/
 			/*,new DebugButton("bwm", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			Player player = world.model.player;
-	    			player.addQuestProgress(new QuestProgress("bwm_agent", 1));
-	    			player.addQuestProgress(new QuestProgress("bwm_agent", 5));
-	    			player.addQuestProgress(new QuestProgress("bwm_agent", 10));
-	    			player.addQuestProgress(new QuestProgress("bwm_agent", 20));
-	    			player.addQuestProgress(new QuestProgress("bwm_agent", 25));
-	    			player.addQuestProgress(new QuestProgress("bwm_agent", 30));
-	    			player.addQuestProgress(new QuestProgress("bwm_agent", 40));
-	    			player.addQuestProgress(new QuestProgress("bwm_agent", 50));
-	    			player.addQuestProgress(new QuestProgress("bwm_agent", 60));
-	    			
-	    			controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "blackwater_mountain45", "south", 0, 0);
+					Player player = world.model.player;
+					player.addQuestProgress(new QuestProgress("bwm_agent", 1));
+					player.addQuestProgress(new QuestProgress("bwm_agent", 5));
+					player.addQuestProgress(new QuestProgress("bwm_agent", 10));
+					player.addQuestProgress(new QuestProgress("bwm_agent", 20));
+					player.addQuestProgress(new QuestProgress("bwm_agent", 25));
+					player.addQuestProgress(new QuestProgress("bwm_agent", 30));
+					player.addQuestProgress(new QuestProgress("bwm_agent", 40));
+					player.addQuestProgress(new QuestProgress("bwm_agent", 50));
+					player.addQuestProgress(new QuestProgress("bwm_agent", 60));
+
+					controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "blackwater_mountain45", "south", 0, 0);
 				}
 			})*/
 			/*,new DebugButton("prim", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "blackwater_mountain29", "south", 0, 0);
+					controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "blackwater_mountain29", "south", 0, 0);
 				}
 			})*/
 			/*,new DebugButton("exp+=10000", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			world.model.player.addExperience(10000);
-	    			mainActivity.updateStatus();
-	    			showToast(mainActivity, "DEBUG: given 10000 exp", Toast.LENGTH_SHORT);
+					world.model.player.addExperience(10000);
+					mainActivity.updateStatus();
+					showToast(mainActivity, "DEBUG: given 10000 exp", Toast.LENGTH_SHORT);
 				}
 			})*/
 			,new DebugButton("reset", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			for(PredefinedMap map : world.maps.getAllMaps()) {
-	    				map.resetTemporaryData();
-	    			}
-	    			showToast(mainActivity, "DEBUG: maps respawned", Toast.LENGTH_SHORT);
+					for(PredefinedMap map : world.maps.getAllMaps()) {
+						map.resetTemporaryData();
+					}
+					showToast(mainActivity, "DEBUG: maps respawned", Toast.LENGTH_SHORT);
 				}
 			})
 			,new DebugButton("hp", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			world.model.player.baseTraits.maxHP = 200;
-	    			world.model.player.health.max = world.model.player.baseTraits.maxHP;
-	    			controllerContext.actorStatsController.setActorMaxHealth(world.model.player);
-	    			world.model.player.conditions.clear();
-	    			showToast(mainActivity, "DEBUG: hp set to max", Toast.LENGTH_SHORT);
+					world.model.player.baseTraits.maxHP = 200;
+					world.model.player.health.max = world.model.player.baseTraits.maxHP;
+					controllerContext.actorStatsController.setActorMaxHealth(world.model.player);
+					world.model.player.conditions.clear();
+					showToast(mainActivity, "DEBUG: hp set to max", Toast.LENGTH_SHORT);
 				}
 			})
 			/*
 			,new DebugButton("cg", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "crossglen", "hall", 0, 0);
+					controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "crossglen", "hall", 0, 0);
 				}
 			})
 			,new DebugButton("vg", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "vilegard_s", "tavern", 0, 0);
+					controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "vilegard_s", "tavern", 0, 0);
 				}
 			})
 			,new DebugButton("cr", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "houseatcrossroads4", "down", 0, 0);
+					controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "houseatcrossroads4", "down", 0, 0);
 				}
 			})
 			,new DebugButton("lf", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "loneford9", "south", 0, 0);
+					controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "loneford9", "south", 0, 0);
 				}
 			})
 			,new DebugButton("fh", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "fallhaven_ne", "clothes", 0, 0);
+					controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "fallhaven_ne", "clothes", 0, 0);
 				}
 			})
 			,new DebugButton("rc", new OnClickListener() {
-	    		@Override
+				@Override
 				public void onClick(View arg0) {
-	    			controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "roadtocarntower1", "left3", 0, 0);
+					controllerContext.movementController.placePlayerAt(MapObject.MAPEVENT_NEWMAP, "roadtocarntower1", "left3", 0, 0);
 				}
 			})
 			*/
-			
-    	});
+
+		});
 	}
 
 	private void showToast(Context context, String msg, int duration) {
@@ -183,42 +183,42 @@ public final class DebugInterface {
 	}
 
 	private static class DebugButton {
-    	public final String text;
-    	public final OnClickListener listener;
+		public final String text;
+		public final OnClickListener listener;
 		public DebugButton(String text, OnClickListener listener) {
 			this.text = text;
 			this.listener = listener;
 		}
-    }
-    
+	}
+
 	private void addDebugButton(DebugButton button, int id, RelativeLayout layout) {
-    	if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
-    	
-    	RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, res.getDimensionPixelSize(R.dimen.smalltext_buttonheight));
-    	if (id == 1) 
-    		lp.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
-    	else
-    		lp.addRule(RelativeLayout.RIGHT_OF, id - 1);
-    	lp.addRule(RelativeLayout.ABOVE, R.id.main_statusview);
-    	Button b = new Button(mainActivity);
-    	b.setText(button.text);
-    	b.setTextSize(res.getDimension(R.dimen.actionbar_text));
-    	b.setId(id);
-    	b.setLayoutParams(lp);
-    	b.setOnClickListener(button.listener);
-        layout.addView(b);
-    }
-    
+		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
+
+		RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, res.getDimensionPixelSize(R.dimen.smalltext_buttonheight));
+		if (id == 1)
+			lp.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+		else
+			lp.addRule(RelativeLayout.RIGHT_OF, id - 1);
+		lp.addRule(RelativeLayout.ABOVE, R.id.main_statusview);
+		Button b = new Button(mainActivity);
+		b.setText(button.text);
+		b.setTextSize(res.getDimension(R.dimen.actionbar_text));
+		b.setId(id);
+		b.setLayoutParams(lp);
+		b.setOnClickListener(button.listener);
+		layout.addView(b);
+	}
+
 	private void addDebugButtons(DebugButton[] buttons) {
-    	if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
-    	
-    	if (buttons == null || buttons.length <= 0) return;
-    	RelativeLayout layout = (RelativeLayout) mainActivity.findViewById(R.id.main_container);
-    	
-    	int id = 1;
-    	for (DebugButton b : buttons) {
-    		addDebugButton(b, id, layout);
-    		++id;
-    	}
-    }
+		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
+
+		if (buttons == null || buttons.length <= 0) return;
+		RelativeLayout layout = (RelativeLayout) mainActivity.findViewById(R.id.main_container);
+
+		int id = 1;
+		for (DebugButton b : buttons) {
+			addDebugButton(b, id, layout);
+			++id;
+		}
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
index 09ec2a620..e5aea4d81 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java
@@ -21,66 +21,66 @@ import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class DisplayWorldMapActivity extends Activity {
 	private WorldContext world;
-	
+
 	private WebView displayworldmap_webview;
 	private String worldMapSegmentName;
-	
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
-        this.world = app.getWorld();
-        
-        app.setWindowParameters(this);
-        
-        setContentView(R.layout.displayworldmap);
-        
-        displayworldmap_webview = (WebView) findViewById(R.id.displayworldmap_webview);
-        displayworldmap_webview.setBackgroundColor(getResources().getColor(R.color.displayworldmap_background));
-        displayworldmap_webview.getSettings().setBuiltInZoomControls(true);
-        enableJavascript();
-        
-        Button b = (Button) findViewById(R.id.displayworldmap_close);
-        b.setOnClickListener(new OnClickListener() {
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		this.world = app.getWorld();
+
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.displayworldmap);
+
+		displayworldmap_webview = (WebView) findViewById(R.id.displayworldmap_webview);
+		displayworldmap_webview.setBackgroundColor(getResources().getColor(R.color.displayworldmap_background));
+		displayworldmap_webview.getSettings().setBuiltInZoomControls(true);
+		enableJavascript();
+
+		Button b = (Button) findViewById(R.id.displayworldmap_close);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				DisplayWorldMapActivity.this.finish();
 			}
 		});
-        
-        worldMapSegmentName = getIntent().getStringExtra("worldMapSegmentName");
-    }
-    
-    @SuppressLint("SetJavaScriptEnabled")
+
+		worldMapSegmentName = getIntent().getStringExtra("worldMapSegmentName");
+	}
+
+	@SuppressLint("SetJavaScriptEnabled")
 	public void enableJavascript() {
-    	displayworldmap_webview.getSettings().setJavaScriptEnabled(true);
-    }
-    
-    @Override
-    public void onResume() {
-        super.onResume();
-        update();
-    }
-	
+		displayworldmap_webview.getSettings().setJavaScriptEnabled(true);
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		update();
+	}
+
 	private void update() {
 		File worldmap = WorldMapController.getCombinedWorldMapFile(worldMapSegmentName);
-		
+
 		if (!worldmap.exists()) {
 			Toast.makeText(this, getResources().getString(R.string.menu_button_worldmap_failed), Toast.LENGTH_LONG).show();
 			this.finish();
 		}
-		
+
 		WorldMapSegment segment = world.maps.worldMapSegments.get(worldMapSegmentName);
 		WorldMapSegmentMap map = segment.maps.get(world.model.currentMap.name);
 		if (map == null) {
-            this.finish();
-            return;
-        }
+			this.finish();
+			return;
+		}
 
 		String url = "file://" + worldmap.getAbsolutePath() + '?'
-				+ (world.model.player.position.x + map.worldPosition.x) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE 
+				+ (world.model.player.position.x + map.worldPosition.x) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE
 				+ ','
 				+ (world.model.player.position.y + map.worldPosition.y-1) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE;
 		L.log("Showing " + url);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
index 86ac03275..8ccbd2b89 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java
@@ -17,43 +17,43 @@ public final class HeroinfoActivity extends FragmentActivity {
 
 	private FragmentTabHost tabHost;
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
-        this.world = app.getWorld();
-        
-        app.setWindowParameters(this);
-        
-        setContentView(R.layout.tabbedlayout);
-        
-        Resources res = getResources();
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		this.world = app.getWorld();
 
-        tabHost = (FragmentTabHost) findViewById(android.R.id.tabhost);
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.tabbedlayout);
+
+		Resources res = getResources();
+
+		tabHost = (FragmentTabHost) findViewById(android.R.id.tabhost);
 		tabHost.setup(this, getSupportFragmentManager(), R.id.realtabcontent);
 
-        tabHost.addTab(tabHost.newTabSpec("char")
-        		.setIndicator(res.getString(R.string.heroinfo_char), res.getDrawable(R.drawable.char_hero))
+		tabHost.addTab(tabHost.newTabSpec("char")
+				.setIndicator(res.getString(R.string.heroinfo_char), res.getDrawable(R.drawable.char_hero))
 				,HeroinfoActivity_Stats.class, null);
-        tabHost.addTab(tabHost.newTabSpec("quests")
-        		.setIndicator(res.getString(R.string.heroinfo_quests), res.getDrawable(R.drawable.ui_icon_quest))
+		tabHost.addTab(tabHost.newTabSpec("quests")
+				.setIndicator(res.getString(R.string.heroinfo_quests), res.getDrawable(R.drawable.ui_icon_quest))
 				,HeroinfoActivity_Quests.class, null);
-        tabHost.addTab(tabHost.newTabSpec("skills")
-        		.setIndicator(res.getString(R.string.heroinfo_skill), res.getDrawable(R.drawable.ui_icon_skill))
+		tabHost.addTab(tabHost.newTabSpec("skills")
+				.setIndicator(res.getString(R.string.heroinfo_skill), res.getDrawable(R.drawable.ui_icon_skill))
 				,HeroinfoActivity_Skills.class, null);
-        tabHost.addTab(tabHost.newTabSpec("inv")
-        		.setIndicator(res.getString(R.string.heroinfo_inv), res.getDrawable(R.drawable.ui_icon_equipment))
+		tabHost.addTab(tabHost.newTabSpec("inv")
+				.setIndicator(res.getString(R.string.heroinfo_inv), res.getDrawable(R.drawable.ui_icon_equipment))
 				,HeroinfoActivity_Inventory.class, null);
-        String t = world.model.uiSelections.selectedTabHeroInfo;
-        if (t != null && t.length() > 0) {
-        	tabHost.setCurrentTabByTag(t);
-        }
-    }
+		String t = world.model.uiSelections.selectedTabHeroInfo;
+		if (t != null && t.length() > 0) {
+			tabHost.setCurrentTabByTag(t);
+		}
+	}
 
 	@Override
-    protected void onPause() {
-        super.onPause();
-        world.model.uiSelections.selectedTabHeroInfo = tabHost.getCurrentTabTag();
-    }
+	protected void onPause() {
+		super.onPause();
+		world.model.uiSelections.selectedTabHeroInfo = tabHost.getCurrentTabTag();
+	}
 }
\ No newline at end of file
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
index 2d25b3acc..fc2e41e84 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
@@ -23,67 +23,67 @@ public final class ItemInfoActivity extends Activity {
 	}
 
 	@Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
 		final WorldContext world = app.getWorld();
-        
-        app.setWindowParameters(this);
-        
-        final Intent intent = getIntent();
-        Bundle params = intent.getExtras();
-        String itemTypeID = params.getString("itemTypeID");
-        final ItemType itemType = world.itemTypes.getItemType(itemTypeID);
-        
-        final String buttonText = params.getString("buttonText");
-        boolean buttonEnabled = params.getBoolean("buttonEnabled");
-        
-        setContentView(R.layout.iteminfo);
 
-        TextView tv = (TextView) findViewById(R.id.iteminfo_title);
-        tv.setText(itemType.getName(world.model.player));
-        world.tileManager.setImageViewTileForSingleItemType(getResources(), tv, itemType);
+		app.setWindowParameters(this);
 
-        tv = (TextView) findViewById(R.id.iteminfo_description);
-        String description = itemType.getDescription();
-        if (description != null) {
-            tv.setText(description);
-            tv.setVisibility(View.VISIBLE);
-        } else {
-            tv.setVisibility(View.GONE);
-        }
+		final Intent intent = getIntent();
+		Bundle params = intent.getExtras();
+		String itemTypeID = params.getString("itemTypeID");
+		final ItemType itemType = world.itemTypes.getItemType(itemTypeID);
 
-        tv = (TextView) findViewById(R.id.iteminfo_category);
-        tv.setText(itemType.category.displayName);
-        
-        ((ItemEffectsView) findViewById(R.id.iteminfo_effects)).update(
-        		itemType.effects_equip,
-        		itemType.effects_use == null ? null : Collections.singletonList(itemType.effects_use),
+		final String buttonText = params.getString("buttonText");
+		boolean buttonEnabled = params.getBoolean("buttonEnabled");
+
+		setContentView(R.layout.iteminfo);
+
+		TextView tv = (TextView) findViewById(R.id.iteminfo_title);
+		tv.setText(itemType.getName(world.model.player));
+		world.tileManager.setImageViewTileForSingleItemType(getResources(), tv, itemType);
+
+		tv = (TextView) findViewById(R.id.iteminfo_description);
+		String description = itemType.getDescription();
+		if (description != null) {
+			tv.setText(description);
+			tv.setVisibility(View.VISIBLE);
+		} else {
+			tv.setVisibility(View.GONE);
+		}
+
+		tv = (TextView) findViewById(R.id.iteminfo_category);
+		tv.setText(itemType.category.displayName);
+
+		((ItemEffectsView) findViewById(R.id.iteminfo_effects)).update(
+				itemType.effects_equip,
+				itemType.effects_use == null ? null : Collections.singletonList(itemType.effects_use),
 				itemType.effects_hit == null ? null : Collections.singletonList(itemType.effects_hit),
 				itemType.effects_kill == null ? null : Collections.singletonList(itemType.effects_kill),
 				itemType.isWeapon()
-    		);
-        
-        Button b = (Button) findViewById(R.id.iteminfo_close);
-        b.setOnClickListener(new OnClickListener() {
+			);
+
+		Button b = (Button) findViewById(R.id.iteminfo_close);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				setResult(RESULT_CANCELED);
 				ItemInfoActivity.this.finish();
 			}
 		});
-        
-        b = (Button) findViewById(R.id.iteminfo_action);
-        if (buttonText != null && buttonText.length() > 0) {
-        	b.setVisibility(View.VISIBLE);
-        	b.setEnabled(buttonEnabled);
-        	b.setText(buttonText);
-        } else {
-        	b.setVisibility(View.GONE);
-        }
-        
-        b.setOnClickListener(new OnClickListener() {
+
+		b = (Button) findViewById(R.id.iteminfo_action);
+		if (buttonText != null && buttonText.length() > 0) {
+			b.setVisibility(View.VISIBLE);
+			b.setEnabled(buttonEnabled);
+			b.setText(buttonText);
+		} else {
+			b.setVisibility(View.GONE);
+		}
+
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				Intent result = new Intent();
@@ -92,18 +92,18 @@ public final class ItemInfoActivity extends Activity {
 				ItemInfoActivity.this.finish();
 			}
 		});
-        
-        tv = (TextView) findViewById(R.id.iteminfo_displaytype);
-        if (itemType.isOrdinaryItem()) {
-        	tv.setVisibility(View.GONE);
-        } else {
-        	tv.setVisibility(View.VISIBLE);
-        	final String diplayType = getDisplayTypeString(getResources(), itemType);
-        	tv.setText(diplayType);
-        }
-    }
-    
-    public static String getDisplayTypeString(Resources res, ItemType itemType) {
+
+		tv = (TextView) findViewById(R.id.iteminfo_displaytype);
+		if (itemType.isOrdinaryItem()) {
+			tv.setVisibility(View.GONE);
+		} else {
+			tv.setVisibility(View.VISIBLE);
+			final String diplayType = getDisplayTypeString(getResources(), itemType);
+			tv.setText(diplayType);
+		}
+	}
+
+	public static String getDisplayTypeString(Resources res, ItemType itemType) {
 		switch (itemType.displayType) {
 			case rare: return res.getString(R.string.iteminfo_displaytypes_rare);
 			case extraordinary: return res.getString(R.string.iteminfo_displaytypes_extraordinary);
@@ -112,5 +112,5 @@ public final class ItemInfoActivity extends Activity {
 			case quest: return res.getString(R.string.iteminfo_displaytypes_quest);
 			default: return "";
 		}
-    }
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
index 96b5ef9dc..f212b09cc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java
@@ -24,86 +24,86 @@ public final class LevelUpActivity extends Activity {
 	private TextView levelup_description;
 	private TextView levelup_title;
 	private View levelup_adds_new_skillpoint;
-	
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
-        this.world = app.getWorld();
-        this.controllers = app.getControllerContext();
-        this.player = world.model.player;
-        
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        
-        setContentView(R.layout.levelup);
-    	
-        levelup_title = (TextView) findViewById(R.id.levelup_title);
-    	levelup_description = (TextView) findViewById(R.id.levelup_description);
-        levelup_adds_new_skillpoint = findViewById(R.id.levelup_adds_new_skillpoint);
 
-        Button b;
-        
-        b = (Button) findViewById(R.id.levelup_add_health);
-        b.setOnClickListener(new OnClickListener() {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		this.world = app.getWorld();
+		this.controllers = app.getControllerContext();
+		this.player = world.model.player;
+
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+		setContentView(R.layout.levelup);
+
+		levelup_title = (TextView) findViewById(R.id.levelup_title);
+		levelup_description = (TextView) findViewById(R.id.levelup_description);
+		levelup_adds_new_skillpoint = findViewById(R.id.levelup_adds_new_skillpoint);
+
+		Button b;
+
+		b = (Button) findViewById(R.id.levelup_add_health);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				levelup(ActorStatsController.LevelUpSelection.health);
 			}
 		});
-        b.setText(getString(R.string.levelup_add_health, Constants.LEVELUP_EFFECT_HEALTH));
-        
-        b = (Button) findViewById(R.id.levelup_add_attackchance);
-        b.setOnClickListener(new OnClickListener() {
+		b.setText(getString(R.string.levelup_add_health, Constants.LEVELUP_EFFECT_HEALTH));
+
+		b = (Button) findViewById(R.id.levelup_add_attackchance);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				levelup(ActorStatsController.LevelUpSelection.attackChance);
 			}
 		});
-        b.setText(getString(R.string.levelup_add_attackchance, Constants.LEVELUP_EFFECT_ATK_CH));
-        
-        b = (Button) findViewById(R.id.levelup_add_attackdamage);
-        b.setOnClickListener(new OnClickListener() {
+		b.setText(getString(R.string.levelup_add_attackchance, Constants.LEVELUP_EFFECT_ATK_CH));
+
+		b = (Button) findViewById(R.id.levelup_add_attackdamage);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				levelup(ActorStatsController.LevelUpSelection.attackDamage);
 			}
 		});
-        b.setText(getString(R.string.levelup_add_attackdamage, Constants.LEVELUP_EFFECT_ATK_DMG));
-        
-        b = (Button) findViewById(R.id.levelup_add_blockchance);
-        b.setOnClickListener(new OnClickListener() {
+		b.setText(getString(R.string.levelup_add_attackdamage, Constants.LEVELUP_EFFECT_ATK_DMG));
+
+		b = (Button) findViewById(R.id.levelup_add_blockchance);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				levelup(ActorStatsController.LevelUpSelection.blockChance);
 			}
 		});
-        b.setText(getString(R.string.levelup_add_blockchance, Constants.LEVELUP_EFFECT_DEF_CH));
-    }
-    
-    @Override
-    protected void onResume() {
-    	super.onResume();
-    	final Resources res = getResources();
-    	
-    	if (!player.canLevelup()) {
-    		this.finish();
-    		return;
-    	}
-    	
-    	world.tileManager.setImageViewTile(res, levelup_title, player);
-        levelup_description.setText(res.getString(R.string.levelup_description, player.getLevel() + 1));
-        if (player.nextLevelAddsNewSkillpoint()) {
-        	levelup_adds_new_skillpoint.setVisibility(View.VISIBLE);
-        } else {
-        	levelup_adds_new_skillpoint.setVisibility(View.GONE);
-        }
-    }
+		b.setText(getString(R.string.levelup_add_blockchance, Constants.LEVELUP_EFFECT_DEF_CH));
+	}
 
-    public void levelup(ActorStatsController.LevelUpSelection selectionID) {
-    	if (LevelUpActivity.this.isFinishing()) return;
-    	
-    	controllers.actorStatsController.addLevelupEffect(player, selectionID);
-    	finish();
-    }
+	@Override
+	protected void onResume() {
+		super.onResume();
+		final Resources res = getResources();
+
+		if (!player.canLevelup()) {
+			this.finish();
+			return;
+		}
+
+		world.tileManager.setImageViewTile(res, levelup_title, player);
+		levelup_description.setText(res.getString(R.string.levelup_description, player.getLevel() + 1));
+		if (player.nextLevelAddsNewSkillpoint()) {
+			levelup_adds_new_skillpoint.setVisibility(View.VISIBLE);
+		} else {
+			levelup_adds_new_skillpoint.setVisibility(View.GONE);
+		}
+	}
+
+	public void levelup(ActorStatsController.LevelUpSelection selectionID) {
+		if (LevelUpActivity.this.isFinishing()) return;
+
+		controllers.actorStatsController.addLevelupEffect(player, selectionID);
+		finish();
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
index 8c076e59a..2ac5dd1af 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java
@@ -1,148 +1,148 @@
-package com.gpl.rpg.AndorsTrail.activity;
-
-import java.util.Collections;
-import java.util.List;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
-
-public final class LoadSaveActivity extends Activity implements OnClickListener {
-	private boolean isLoading = true;
-	private static final int SLOT_NUMBER_CREATE_NEW_SLOT = -1;
-	private static final int SLOT_NUMBER_FIRST_SLOT = 1;
-	private ModelContainer model;
-	private AndorsTrailPreferences preferences;
-	
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        app.setWindowParameters(this);
-        this.model = app.getWorld().model;
-        this.preferences = app.getPreferences();
-        
-        String loadsave = getIntent().getData().getLastPathSegment();
-        isLoading = (loadsave.equalsIgnoreCase("load"));
-                
-        setContentView(R.layout.loadsave);
-    	
-        TextView tv = (TextView) findViewById(R.id.loadsave_title);
-        if (isLoading) {
-        	tv.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_menu_search, 0, 0, 0);
-        	tv.setText(R.string.loadsave_title_load);
-        } else {
-        	tv.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_menu_save, 0, 0, 0);
-        	tv.setText(R.string.loadsave_title_save);
-        }
-        
-        ViewGroup slotList = (ViewGroup) findViewById(R.id.loadsave_slot_list);
-        Button slotTemplateButton = (Button) findViewById(R.id.loadsave_slot_n);
-        Button createNewSlot = (Button) findViewById(R.id.loadsave_save_to_new_slot);
-        LayoutParams params = slotTemplateButton.getLayoutParams();
-        slotList.removeView(slotTemplateButton);
-        slotList.removeView(createNewSlot);
-        
-        addSavegameSlotButtons(slotList, params, Savegames.getUsedSavegameSlots(this));
-        
-        if (!isLoading) {
-        	Button b = new Button(this);
-			b.setLayoutParams(params);
-			b.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
-	    	b.setOnClickListener(this);
-	        b.setText(R.string.loadsave_save_to_new_slot);
-	        slotList.addView(b, params);
-        }
-    }
-    
-	private void addSavegameSlotButtons(ViewGroup parent, LayoutParams params, List<Integer> usedSavegameSlots) {
-		for (int slot : usedSavegameSlots) {
-			final FileHeader header = Savegames.quickload(this, slot);
-	        if (header == null) continue;
-			
-	        Button b = new Button(this);
-			b.setLayoutParams(params);
-			b.setTag(slot);
-	    	b.setOnClickListener(this);
-	        b.setText(slot + ". " + header.describe());
-			parent.addView(b, params);
-		}
-	}
-    
-	public void loadsave(int slot) {
-		if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) {
-			List<Integer> usedSlots = Savegames.getUsedSavegameSlots(this);
-			if (usedSlots.isEmpty()) slot = SLOT_NUMBER_FIRST_SLOT;
-			else slot = Collections.max(usedSlots) + 1;
-		}
-		if (slot < SLOT_NUMBER_FIRST_SLOT) slot = SLOT_NUMBER_FIRST_SLOT;
-
-		Intent i = new Intent();
-    	i.putExtra("slot", slot);
-    	setResult(Activity.RESULT_OK, i);
-    	LoadSaveActivity.this.finish();
-    }
-
-	private String getConfirmOverwriteQuestion(int slot) {
-		if (isLoading) return null;
-		if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) return null;					// if we're creating a new slot
-		
-		if (preferences.displayOverwriteSavegame == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_ALWAYS) { 
-			return getString(R.string.loadsave_save_overwrite_confirmation_all);
-		}
-		if (preferences.displayOverwriteSavegame == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_NEVER) {
-			return null;
-		}
-		
-		final String currentPlayerName = model.player.getName();
-		final FileHeader header = Savegames.quickload(this, slot);
-		if (header == null) return null;
-
-		final String savedPlayerName = header.playerName;
-		if (currentPlayerName.equals(savedPlayerName)) return null;			// if the names match
-		
-		return getString(R.string.loadsave_save_overwrite_confirmation, savedPlayerName, currentPlayerName);
-	}
-	
-	@Override
-	public void onClick(View view) {
-		final int slot = (Integer) view.getTag();
-		final String message = getConfirmOverwriteQuestion(slot);
-		
-		if (message != null) {
-			final String title = 
-				getString(R.string.loadsave_save_overwrite_confirmation_title) + ' '
-				+ getString(R.string.loadsave_save_overwrite_confirmation_slot, slot);
-			new AlertDialog.Builder(this)
-		        .setIcon(android.R.drawable.ic_dialog_alert)
-		        .setTitle(title)
-		        .setMessage(message)
-		        .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-		            @Override
-		            public void onClick(DialogInterface dialog, int which) {
-		            	loadsave(slot);
-		            }
-		        })
-		        .setNegativeButton(android.R.string.no, null)
-		        .show();
-		} else {
-			loadsave(slot);
-		}
-	}
-}
+package com.gpl.rpg.AndorsTrail.activity;
+
+import java.util.Collections;
+import java.util.List;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+
+public final class LoadSaveActivity extends Activity implements OnClickListener {
+	private boolean isLoading = true;
+	private static final int SLOT_NUMBER_CREATE_NEW_SLOT = -1;
+	private static final int SLOT_NUMBER_FIRST_SLOT = 1;
+	private ModelContainer model;
+	private AndorsTrailPreferences preferences;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		app.setWindowParameters(this);
+		this.model = app.getWorld().model;
+		this.preferences = app.getPreferences();
+
+		String loadsave = getIntent().getData().getLastPathSegment();
+		isLoading = (loadsave.equalsIgnoreCase("load"));
+
+		setContentView(R.layout.loadsave);
+
+		TextView tv = (TextView) findViewById(R.id.loadsave_title);
+		if (isLoading) {
+			tv.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_menu_search, 0, 0, 0);
+			tv.setText(R.string.loadsave_title_load);
+		} else {
+			tv.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_menu_save, 0, 0, 0);
+			tv.setText(R.string.loadsave_title_save);
+		}
+
+		ViewGroup slotList = (ViewGroup) findViewById(R.id.loadsave_slot_list);
+		Button slotTemplateButton = (Button) findViewById(R.id.loadsave_slot_n);
+		Button createNewSlot = (Button) findViewById(R.id.loadsave_save_to_new_slot);
+		LayoutParams params = slotTemplateButton.getLayoutParams();
+		slotList.removeView(slotTemplateButton);
+		slotList.removeView(createNewSlot);
+
+		addSavegameSlotButtons(slotList, params, Savegames.getUsedSavegameSlots(this));
+
+		if (!isLoading) {
+			Button b = new Button(this);
+			b.setLayoutParams(params);
+			b.setTag(SLOT_NUMBER_CREATE_NEW_SLOT);
+			b.setOnClickListener(this);
+			b.setText(R.string.loadsave_save_to_new_slot);
+			slotList.addView(b, params);
+		}
+	}
+
+	private void addSavegameSlotButtons(ViewGroup parent, LayoutParams params, List<Integer> usedSavegameSlots) {
+		for (int slot : usedSavegameSlots) {
+			final FileHeader header = Savegames.quickload(this, slot);
+			if (header == null) continue;
+
+			Button b = new Button(this);
+			b.setLayoutParams(params);
+			b.setTag(slot);
+			b.setOnClickListener(this);
+			b.setText(slot + ". " + header.describe());
+			parent.addView(b, params);
+		}
+	}
+
+	public void loadsave(int slot) {
+		if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) {
+			List<Integer> usedSlots = Savegames.getUsedSavegameSlots(this);
+			if (usedSlots.isEmpty()) slot = SLOT_NUMBER_FIRST_SLOT;
+			else slot = Collections.max(usedSlots) + 1;
+		}
+		if (slot < SLOT_NUMBER_FIRST_SLOT) slot = SLOT_NUMBER_FIRST_SLOT;
+
+		Intent i = new Intent();
+		i.putExtra("slot", slot);
+		setResult(Activity.RESULT_OK, i);
+		LoadSaveActivity.this.finish();
+	}
+
+	private String getConfirmOverwriteQuestion(int slot) {
+		if (isLoading) return null;
+		if (slot == SLOT_NUMBER_CREATE_NEW_SLOT) return null;					// if we're creating a new slot
+
+		if (preferences.displayOverwriteSavegame == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_ALWAYS) {
+			return getString(R.string.loadsave_save_overwrite_confirmation_all);
+		}
+		if (preferences.displayOverwriteSavegame == AndorsTrailPreferences.CONFIRM_OVERWRITE_SAVEGAME_NEVER) {
+			return null;
+		}
+
+		final String currentPlayerName = model.player.getName();
+		final FileHeader header = Savegames.quickload(this, slot);
+		if (header == null) return null;
+
+		final String savedPlayerName = header.playerName;
+		if (currentPlayerName.equals(savedPlayerName)) return null;			// if the names match
+
+		return getString(R.string.loadsave_save_overwrite_confirmation, savedPlayerName, currentPlayerName);
+	}
+
+	@Override
+	public void onClick(View view) {
+		final int slot = (Integer) view.getTag();
+		final String message = getConfirmOverwriteQuestion(slot);
+
+		if (message != null) {
+			final String title =
+				getString(R.string.loadsave_save_overwrite_confirmation_title) + ' '
+				+ getString(R.string.loadsave_save_overwrite_confirmation_slot, slot);
+			new AlertDialog.Builder(this)
+				.setIcon(android.R.drawable.ic_dialog_alert)
+				.setTitle(title)
+				.setMessage(message)
+				.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialog, int which) {
+						loadsave(slot);
+					}
+				})
+				.setNegativeButton(android.R.string.no, null)
+				.show();
+		} else {
+			loadsave(slot);
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
index 2903b9103..029d996af 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java
@@ -1,82 +1,82 @@
-package com.gpl.rpg.AndorsTrail.activity;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.DialogInterface.OnDismissListener;
-import android.os.Bundle;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail.WorldSetup;
-import com.gpl.rpg.AndorsTrail.WorldSetup.OnResourcesLoadedListener;
-import com.gpl.rpg.AndorsTrail.WorldSetup.OnSceneLoadedListener;
-
-public final class LoadingActivity extends Activity implements OnResourcesLoadedListener, OnSceneLoadedListener {
-
-    private WorldSetup setup;
-    private ProgressDialog progressDialog;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        app.setWindowParameters(this);
-        this.setup = app.getWorldSetup();
-    }
-	
-	@Override
-    public void onResume() {
-		super.onResume();
-        progressDialog = ProgressDialog.show(this, null, getString(R.string.dialog_loading_message));
-        setup.setOnResourcesLoadedListener(this);
-	}
-	
-	@Override
-    public void onPause() {
-		super.onPause();
-		setup.setOnResourcesLoadedListener(null);
-		setup.removeOnSceneLoadedListener(this);
-	}
-	
-	@Override
-	public void onResourcesLoaded() {
-		setup.startCharacterSetup(this);
-	}
-	
-	@Override
-	public void onSceneLoaded() {
-        progressDialog.dismiss();
-    	startActivity(new Intent(this, MainActivity.class));
-    	this.finish();
-	}
-	
-	@Override
-	public void onSceneLoadFailed(int loadResult) {
-        progressDialog.dismiss();
-    	if (loadResult == Savegames.LOAD_RESULT_FUTURE_VERSION) {
-            showLoadingFailedDialog(R.string.dialog_loading_failed_incorrectversion);
-    	} else {
-            showLoadingFailedDialog(R.string.dialog_loading_failed_message);
-    	}
-	}
-
-	private void showLoadingFailedDialog(int messageResourceID) {
-		Dialog d = new AlertDialog.Builder(this)
-	        .setTitle(R.string.dialog_loading_failed_title)
-	        .setMessage(messageResourceID)
-	        .setNeutralButton(android.R.string.ok, null)
-	        .create();
-	    d.setOnDismissListener(new OnDismissListener() {
-			@Override
-			public void onDismiss(DialogInterface dialog) {
-				LoadingActivity.this.finish();
-			}
-		});
-        d.show();
-	}
-}
+package com.gpl.rpg.AndorsTrail.activity;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.DialogInterface.OnDismissListener;
+import android.os.Bundle;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.WorldSetup.OnResourcesLoadedListener;
+import com.gpl.rpg.AndorsTrail.WorldSetup.OnSceneLoadedListener;
+
+public final class LoadingActivity extends Activity implements OnResourcesLoadedListener, OnSceneLoadedListener {
+
+	private WorldSetup setup;
+	private ProgressDialog progressDialog;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		app.setWindowParameters(this);
+		this.setup = app.getWorldSetup();
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		progressDialog = ProgressDialog.show(this, null, getString(R.string.dialog_loading_message));
+		setup.setOnResourcesLoadedListener(this);
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		setup.setOnResourcesLoadedListener(null);
+		setup.removeOnSceneLoadedListener(this);
+	}
+
+	@Override
+	public void onResourcesLoaded() {
+		setup.startCharacterSetup(this);
+	}
+
+	@Override
+	public void onSceneLoaded() {
+		progressDialog.dismiss();
+		startActivity(new Intent(this, MainActivity.class));
+		this.finish();
+	}
+
+	@Override
+	public void onSceneLoadFailed(int loadResult) {
+		progressDialog.dismiss();
+		if (loadResult == Savegames.LOAD_RESULT_FUTURE_VERSION) {
+			showLoadingFailedDialog(R.string.dialog_loading_failed_incorrectversion);
+		} else {
+			showLoadingFailedDialog(R.string.dialog_loading_failed_message);
+		}
+	}
+
+	private void showLoadingFailedDialog(int messageResourceID) {
+		Dialog d = new AlertDialog.Builder(this)
+			.setTitle(R.string.dialog_loading_failed_title)
+			.setMessage(messageResourceID)
+			.setNeutralButton(android.R.string.ok, null)
+			.create();
+		d.setOnDismissListener(new OnDismissListener() {
+			@Override
+			public void onDismiss(DialogInterface dialog) {
+				LoadingActivity.this.finish();
+			}
+		});
+		d.show();
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
index 84566918e..8bc588640 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MainActivity.java
@@ -38,45 +38,45 @@ import java.util.Collection;
 
 public final class MainActivity extends Activity implements PlayerMovementListener, CombatActionListener, CombatTurnListener, WorldEventListener {
 
-    public static final int INTENTREQUEST_MONSTERENCOUNTER = 2;
-    public static final int INTENTREQUEST_CONVERSATION = 4;
-    public static final int INTENTREQUEST_SAVEGAME = 8;
-	
-    private ControllerContext controllers;
-    private WorldContext world;
+	public static final int INTENTREQUEST_MONSTERENCOUNTER = 2;
+	public static final int INTENTREQUEST_CONVERSATION = 4;
+	public static final int INTENTREQUEST_SAVEGAME = 8;
 
-    private MainView mainview;
-    private StatusView statusview;
-    private CombatView combatview;
-    private QuickitemView quickitemview;
-    private DisplayActiveActorConditionIcons activeConditions;
-    private ToolboxView toolboxview;
+	private ControllerContext controllers;
+	private WorldContext world;
+
+	private MainView mainview;
+	private StatusView statusview;
+	private CombatView combatview;
+	private QuickitemView quickitemview;
+	private DisplayActiveActorConditionIcons activeConditions;
+	private ToolboxView toolboxview;
 
 	private TextView statusText;
 	private WeakReference<Toast> lastToast = null;
 	private ContextMenuInfo lastSelectedMenu = null;
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
-        AndorsTrailPreferences preferences = app.getPreferences();
-        this.world = app.getWorld();
-        this.controllers = app.getControllerContext();
-    	app.setWindowParameters(this);
-        
-        setContentView(R.layout.main);
-        mainview = (MainView) findViewById(R.id.main_mainview);
-        statusview = (StatusView) findViewById(R.id.main_statusview);
-        combatview = (CombatView) findViewById(R.id.main_combatview);
-        quickitemview = (QuickitemView) findViewById(R.id.main_quickitemview);
-        activeConditions = new DisplayActiveActorConditionIcons(controllers, world, this, (RelativeLayout) findViewById(R.id.statusview_activeconditions));
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		AndorsTrailPreferences preferences = app.getPreferences();
+		this.world = app.getWorld();
+		this.controllers = app.getControllerContext();
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.main);
+		mainview = (MainView) findViewById(R.id.main_mainview);
+		statusview = (StatusView) findViewById(R.id.main_statusview);
+		combatview = (CombatView) findViewById(R.id.main_combatview);
+		quickitemview = (QuickitemView) findViewById(R.id.main_quickitemview);
+		activeConditions = new DisplayActiveActorConditionIcons(controllers, world, this, (RelativeLayout) findViewById(R.id.statusview_activeconditions));
 		VirtualDpadView dpad = (VirtualDpadView) findViewById(R.id.main_virtual_dpad);
-        toolboxview = (ToolboxView) findViewById(R.id.main_toolboxview);
-        statusview.registerToolboxViews(toolboxview, quickitemview);
-        
+		toolboxview = (ToolboxView) findViewById(R.id.main_toolboxview);
+		statusview.registerToolboxViews(toolboxview, quickitemview);
+
 		statusText = (TextView) findViewById(R.id.statusview_statustext);
 		statusText.setOnClickListener(new OnClickListener() {
 			@Override
@@ -85,25 +85,25 @@ public final class MainActivity extends Activity implements PlayerMovementListen
 			}
 		});
 		clearMessages();
-		
-		if (AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) 
+
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS)
 			new DebugInterface(controllers, world, this).addDebugButtons();
-        
+
 		quickitemview.setVisibility(View.GONE);
-        quickitemview.registerForContextMenu(this);
-    	
-    	dpad.updateVisibility(preferences);
+		quickitemview.registerForContextMenu(this);
+
+		dpad.updateVisibility(preferences);
 		quickitemview.setPosition(preferences);
-    	
-    	// Define which views are in front of each other.
-    	dpad.bringToFront();
-    	quickitemview.bringToFront();
-    	toolboxview.bringToFront();
-    	combatview.bringToFront();
-    	statusview.bringToFront();
-    }
-    	
-    @Override
+
+		// Define which views are in front of each other.
+		dpad.bringToFront();
+		quickitemview.bringToFront();
+		toolboxview.bringToFront();
+		combatview.bringToFront();
+		statusview.bringToFront();
+	}
+
+	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		switch (requestCode) {
@@ -129,10 +129,10 @@ public final class MainActivity extends Activity implements PlayerMovementListen
 			break;
 		}
 	}
-    
+
 	private boolean save(int slot) {
-    	final Player player = world.model.player;
-    	return Savegames.saveWorld(world, this, slot, getString(R.string.savegame_currenthero_displayinfo, player.getLevel(), player.getTotalExperience(), player.getGold()));
+		final Player player = world.model.player;
+		return Savegames.saveWorld(world, this, slot, getString(R.string.savegame_currenthero_displayinfo, player.getLevel(), player.getTotalExperience(), player.getGold()));
 	}
 
 	@Override
@@ -149,52 +149,52 @@ public final class MainActivity extends Activity implements PlayerMovementListen
 	}
 
 	@Override
-    protected void onPause() {
-        super.onPause();
-        controllers.gameRoundController.pause();
-        controllers.movementController.stopMovement();
-        
-        save(Savegames.SLOT_QUICKSAVE);
-    }
-    
-	@Override
-    protected void onResume() {
-        super.onResume();
-        if (!AndorsTrailApplication.getApplicationFromActivity(this).getWorldSetup().isSceneReady) return;
+	protected void onPause() {
+		super.onPause();
+		controllers.gameRoundController.pause();
+		controllers.movementController.stopMovement();
+
+		save(Savegames.SLOT_QUICKSAVE);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		if (!AndorsTrailApplication.getApplicationFromActivity(this).getWorldSetup().isSceneReady) return;
+
+		controllers.gameRoundController.resume();
 
-        controllers.gameRoundController.resume();
-        
 		if (world.model.uiSelections.isInCombat) {
 			controllers.combatController.setCombatSelection(world.model.uiSelections.selectedMonster, world.model.uiSelections.selectedPosition);
 			controllers.combatController.enterCombat(CombatController.BEGIN_TURN_CONTINUE);
 		}
 		updateStatus();
-    }
+	}
 
-    private void unsubscribeFromModel() {
-        activeConditions.unsubscribe();
-        combatview.unsubscribe();
-        mainview.unsubscribe();
-        quickitemview.unsubscribe();
-        statusview.unsubscribe();
-        controllers.movementController.playerMovementListeners.remove(this);
-        controllers.combatController.combatActionListeners.remove(this);
-        controllers.combatController.combatTurnListeners.remove(this);
-        controllers.mapController.worldEventListeners.remove(this);
+	private void unsubscribeFromModel() {
+		activeConditions.unsubscribe();
+		combatview.unsubscribe();
+		mainview.unsubscribe();
+		quickitemview.unsubscribe();
+		statusview.unsubscribe();
+		controllers.movementController.playerMovementListeners.remove(this);
+		controllers.combatController.combatActionListeners.remove(this);
+		controllers.combatController.combatTurnListeners.remove(this);
+		controllers.mapController.worldEventListeners.remove(this);
 	}
 
 	private void subscribeToModelChanges() {
 		controllers.mapController.worldEventListeners.add(this);
-        controllers.combatController.combatTurnListeners.add(this);
-        controllers.combatController.combatActionListeners.add(this);
+		controllers.combatController.combatTurnListeners.add(this);
+		controllers.combatController.combatActionListeners.add(this);
 		controllers.movementController.playerMovementListeners.add(this);
 		statusview.subscribe();
 		quickitemview.subscribe();
 		mainview.subscribe();
 		combatview.subscribe();
-        activeConditions.subscribe();
+		activeConditions.subscribe();
 	}
-	
+
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
 		super.onCreateContextMenu(menu, v, menuInfo);
@@ -213,7 +213,7 @@ public final class MainActivity extends Activity implements PlayerMovementListen
 				assignMenu.add(R.id.quick_menu_assign_group, i, Menu.NONE, itemEntry.itemType.getName(world.model.player));
 		}
 	}
-	
+
 	@Override
 	public boolean onContextItemSelected(MenuItem item) {
 		QuickButtonContextMenuInfo menuInfo;
@@ -236,7 +236,7 @@ public final class MainActivity extends Activity implements PlayerMovementListen
 		}
 		return true;
 	}
-	
+
 	private void updateStatus() {
 		statusview.updateStatus();
 		quickitemview.refreshQuickitems();
@@ -249,7 +249,7 @@ public final class MainActivity extends Activity implements PlayerMovementListen
 		statusText.setText(world.model.combatLog.getLastMessages());
 		statusText.setVisibility(View.VISIBLE);
 	}
-	
+
 	private void clearMessages() {
 		world.model.combatLog.appendCombatEnded();
 		statusText.setVisibility(View.GONE);
@@ -270,10 +270,10 @@ public final class MainActivity extends Activity implements PlayerMovementListen
 		t.show();
 	}
 
-	
-	@Override 
+
+	@Override
 	public void onPlayerMoved(Coord newPosition, Coord previousPosition) { }
-	
+
 	@Override
 	public void onPlayerEnteredNewMap(PredefinedMap map, Coord p) { }
 
@@ -320,11 +320,11 @@ public final class MainActivity extends Activity implements PlayerMovementListen
 		}
 	}
 
-    @Override
-    public void onMonsterMovedDuringCombat(Monster m) {
-        String monsterName = m.getName();
-        message(getString(R.string.combat_result_monstermoved, monsterName));
-    }
+	@Override
+	public void onMonsterMovedDuringCombat(Monster m) {
+		String monsterName = m.getName();
+		message(getString(R.string.combat_result_monstermoved, monsterName));
+	}
 
 	@Override
 	public void onPlayerKilledMonster(Monster target) { }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
index fe838afe3..09fcea2c0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java
@@ -18,54 +18,54 @@ import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 public final class MonsterEncounterActivity extends Activity {
 
 	@Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
 		final WorldContext world = app.getWorld();
 		final ControllerContext controllers = app.getControllerContext();
-        
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        
-        final Monster monster = Dialogs.getMonsterFromIntent(getIntent(), world);
-        if (monster == null) {
-        	finish();
-        	return;
-        }
-        
-        setContentView(R.layout.monsterencounter);
 
-        CharSequence difficulty = getText(MonsterInfoActivity.getMonsterDifficultyResource(controllers, monster));
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-        TextView tv = (TextView) findViewById(R.id.monsterencounter_title);
-        tv.setText(monster.getName());
-        world.tileManager.setImageViewTile(getResources(), tv, monster);
-        
-        tv = (TextView) findViewById(R.id.monsterencounter_description);
-        tv.setText(getString(R.string.dialog_monsterencounter_message, difficulty));
+		final Monster monster = Dialogs.getMonsterFromIntent(getIntent(), world);
+		if (monster == null) {
+			finish();
+			return;
+		}
 
-        Button b = (Button) findViewById(R.id.monsterencounter_attack);
-        b.setOnClickListener(new OnClickListener() {
+		setContentView(R.layout.monsterencounter);
+
+		CharSequence difficulty = getText(MonsterInfoActivity.getMonsterDifficultyResource(controllers, monster));
+
+		TextView tv = (TextView) findViewById(R.id.monsterencounter_title);
+		tv.setText(monster.getName());
+		world.tileManager.setImageViewTile(getResources(), tv, monster);
+
+		tv = (TextView) findViewById(R.id.monsterencounter_description);
+		tv.setText(getString(R.string.dialog_monsterencounter_message, difficulty));
+
+		Button b = (Button) findViewById(R.id.monsterencounter_attack);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				setResult(RESULT_OK);
 				MonsterEncounterActivity.this.finish();
 			}
-		     });
-        b = (Button) findViewById(R.id.monsterencounter_cancel);
-        b.setOnClickListener(new OnClickListener() {
+			 });
+		b = (Button) findViewById(R.id.monsterencounter_cancel);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				setResult(RESULT_CANCELED);
 				MonsterEncounterActivity.this.finish();
 			}
 		});
-        b = (Button) findViewById(R.id.monsterencounter_info);
-        b.setOnClickListener(new OnClickListener() {
+		b = (Button) findViewById(R.id.monsterencounter_info);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				Dialogs.showMonsterInfo(MonsterEncounterActivity.this, monster);
 			}
 		});
-    }
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
index a73fd4d45..dc3e39ca8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java
@@ -1,104 +1,104 @@
-package com.gpl.rpg.AndorsTrail.activity;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.Button;
-import android.widget.TextView;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.Dialogs;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
-import com.gpl.rpg.AndorsTrail.view.RangeBar;
-import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
-
-public final class MonsterInfoActivity extends Activity {
-	
-	private WorldContext world;
-	private ControllerContext controllers;
-	
-	private TextView monsterinfo_title;
-	private TextView monsterinfo_difficulty;
-	private ItemEffectsView monsterinfo_onhiteffects;
-    private RangeBar hp;
-    private ViewGroup monsterinfo_container;
-    private TextView monsterinfo_max_ap;
-	
-    
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
-        this.world = app.getWorld();
-		this.controllers = app.getControllerContext();
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        
-        setContentView(R.layout.monsterinfo);
-
-        monsterinfo_title = (TextView) findViewById(R.id.monsterinfo_title);
-        monsterinfo_difficulty = (TextView) findViewById(R.id.monsterinfo_difficulty);
-        monsterinfo_max_ap = (TextView) findViewById(R.id.monsterinfo_max_ap);
-        
-        Button b = (Button) findViewById(R.id.monsterinfo_close);
-        b.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View arg0) {
-				MonsterInfoActivity.this.finish();
-			}
-		});
-
-        monsterinfo_onhiteffects = (ItemEffectsView) findViewById(R.id.actorinfo_onhiteffects);
-        hp = (RangeBar) findViewById(R.id.monsterinfo_healthbar);
-        hp.init(R.drawable.ui_progress_health, R.string.status_hp);
-        monsterinfo_container = (ViewGroup) findViewById(R.id.monsterinfo_container);
-    }
-
-    @Override
-	protected void onResume() {
-    	super.onResume();
-    	
-    	Monster monster = Dialogs.getMonsterFromIntent(getIntent(), world);
-        if (monster == null) {
-        	finish();
-        	return;
-        }  
-        
-        updateTitle(monster);
-    	updateTraits(monster);
-    }
-
-	private void updateTitle(Monster monster) {
-		monsterinfo_title.setText(monster.getName());
-		world.tileManager.setImageViewTile(getResources(), monsterinfo_title, monster);
-        monsterinfo_difficulty.setText(getMonsterDifficultyResource(controllers, monster));
-	}
-
-	private void updateTraits(Monster monster) {
-		TraitsInfoView.update(monsterinfo_container, monster);
-		monsterinfo_onhiteffects.update(
-        		null, 
-        		null, 
-        		monster.getOnHitEffectsAsList(), 
-        		null,
-        		false);
-        hp.update(monster.getMaxHP(), monster.getCurrentHP());
-        monsterinfo_max_ap.setText(Integer.toString(monster.getMaxAP()));
-    }
-
-	public static int getMonsterDifficultyResource(ControllerContext controllerContext, Monster monster) {
-		final int difficulty = controllerContext.combatController.getMonsterDifficulty(monster);
-		if (difficulty >= 80) return R.string.monster_difficulty_veryeasy;
-		if (difficulty >= 60) return R.string.monster_difficulty_easy;
-		if (difficulty >= 40) return R.string.monster_difficulty_normal;
-		if (difficulty >= 20) return R.string.monster_difficulty_hard;
-		if (difficulty ==  0) return R.string.monster_difficulty_impossible;
-		return R.string.monster_difficulty_veryhard;
-	}
-}
+package com.gpl.rpg.AndorsTrail.activity;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.TextView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
+import com.gpl.rpg.AndorsTrail.view.RangeBar;
+import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
+
+public final class MonsterInfoActivity extends Activity {
+
+	private WorldContext world;
+	private ControllerContext controllers;
+
+	private TextView monsterinfo_title;
+	private TextView monsterinfo_difficulty;
+	private ItemEffectsView monsterinfo_onhiteffects;
+	private RangeBar hp;
+	private ViewGroup monsterinfo_container;
+	private TextView monsterinfo_max_ap;
+
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		this.world = app.getWorld();
+		this.controllers = app.getControllerContext();
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+		setContentView(R.layout.monsterinfo);
+
+		monsterinfo_title = (TextView) findViewById(R.id.monsterinfo_title);
+		monsterinfo_difficulty = (TextView) findViewById(R.id.monsterinfo_difficulty);
+		monsterinfo_max_ap = (TextView) findViewById(R.id.monsterinfo_max_ap);
+
+		Button b = (Button) findViewById(R.id.monsterinfo_close);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				MonsterInfoActivity.this.finish();
+			}
+		});
+
+		monsterinfo_onhiteffects = (ItemEffectsView) findViewById(R.id.actorinfo_onhiteffects);
+		hp = (RangeBar) findViewById(R.id.monsterinfo_healthbar);
+		hp.init(R.drawable.ui_progress_health, R.string.status_hp);
+		monsterinfo_container = (ViewGroup) findViewById(R.id.monsterinfo_container);
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+
+		Monster monster = Dialogs.getMonsterFromIntent(getIntent(), world);
+		if (monster == null) {
+			finish();
+			return;
+		}
+
+		updateTitle(monster);
+		updateTraits(monster);
+	}
+
+	private void updateTitle(Monster monster) {
+		monsterinfo_title.setText(monster.getName());
+		world.tileManager.setImageViewTile(getResources(), monsterinfo_title, monster);
+		monsterinfo_difficulty.setText(getMonsterDifficultyResource(controllers, monster));
+	}
+
+	private void updateTraits(Monster monster) {
+		TraitsInfoView.update(monsterinfo_container, monster);
+		monsterinfo_onhiteffects.update(
+				null,
+				null,
+				monster.getOnHitEffectsAsList(),
+				null,
+				false);
+		hp.update(monster.getMaxHP(), monster.getCurrentHP());
+		monsterinfo_max_ap.setText(Integer.toString(monster.getMaxAP()));
+	}
+
+	public static int getMonsterDifficultyResource(ControllerContext controllerContext, Monster monster) {
+		final int difficulty = controllerContext.combatController.getMonsterDifficulty(monster);
+		if (difficulty >= 80) return R.string.monster_difficulty_veryeasy;
+		if (difficulty >= 60) return R.string.monster_difficulty_easy;
+		if (difficulty >= 40) return R.string.monster_difficulty_normal;
+		if (difficulty >= 20) return R.string.monster_difficulty_hard;
+		if (difficulty == 0) return R.string.monster_difficulty_impossible;
+		return R.string.monster_difficulty_veryhard;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
index ffa611b7f..3ef0821c7 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java
@@ -11,26 +11,26 @@ import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Sell;
 
 public final class ShopActivity extends FragmentActivity {
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
-        app.setWindowParameters(this);
-        
-        setContentView(R.layout.tabbedlayout);
-        
-        final Resources res = getResources();
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
+		app.setWindowParameters(this);
+
+		setContentView(R.layout.tabbedlayout);
+
+		final Resources res = getResources();
 
 		FragmentTabHost tabHost = (FragmentTabHost) findViewById(android.R.id.tabhost);
 		tabHost.setup(this, getSupportFragmentManager(), R.id.realtabcontent);
 
 		tabHost.addTab(tabHost.newTabSpec("buy")
-        		.setIndicator(res.getString(R.string.shop_buy))
+				.setIndicator(res.getString(R.string.shop_buy))
 				,ShopActivity_Buy.class, null);
 		tabHost.addTab(tabHost.newTabSpec("sell")
 				.setIndicator(res.getString(R.string.shop_sell))
 				,ShopActivity_Sell.class, null);
-    }
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
index 85d768930..d6996b682 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java
@@ -22,70 +22,70 @@ import com.gpl.rpg.AndorsTrail.model.actor.Player;
 public final class SkillInfoActivity extends Activity {
 
 	@Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        if (!app.isInitialized()) { finish(); return; }
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		if (!app.isInitialized()) { finish(); return; }
 		final WorldContext world = app.getWorld();
 		final Player player = world.model.player;
-        
-        app.setWindowParameters(this);
-        
-        setContentView(R.layout.skill_info_view);
 
-        final Resources res = getResources();
-        final Intent intent = getIntent();
-        final SkillCollection.SkillID skillID = SkillCollection.SkillID.valueOf(intent.getExtras().getString("skillID"));
-        SkillInfo skill = world.skills.getSkill(skillID);
-        
-        TextView skillinfo_title = (TextView) findViewById(R.id.skillinfo_title);
-        skillinfo_title.setText(getSkillTitleResourceID(skillID));
-        
-        TextView skillinfo_longdescription = (TextView) findViewById(R.id.skillinfo_longdescription);
-        skillinfo_longdescription.setText(getSkillLongDescription(skillID, res));
-        
-        TextView skillinfo_currentlevel = (TextView) findViewById(R.id.skillinfo_currentlevel);
-        final int playerSkillLevel = player.getSkillLevel(skillID);
-        final int nextSkillLevel = playerSkillLevel + 1;
-        if (skill.hasMaxLevel()) {
-        	skillinfo_currentlevel.setText(res.getString(R.string.skill_current_level_with_maximum, playerSkillLevel, skill.maxLevel));
-        } else if (player.hasSkill(skillID)) {
-            skillinfo_currentlevel.setText(res.getString(R.string.skill_current_level, playerSkillLevel));
-        } else {
-            skillinfo_currentlevel.setVisibility(View.GONE);
-        }
-        
-        
-        TextView skillinfo_requirement = (TextView) findViewById(R.id.skillinfo_requirement);
-        LayoutParams requirementParams = skillinfo_requirement.getLayoutParams();
-        ViewGroup requirementList = (ViewGroup) skillinfo_requirement.getParent();
-        requirementList.removeView(skillinfo_requirement);
-        if (shouldShowSkillRequirements(skill, playerSkillLevel)) {
-        	for (SkillLevelRequirement requirement : skill.levelupRequirements) {
-        		TextView tv = new TextView(this);
-        		tv.setLayoutParams(requirementParams);
-        		
-        		int requiredValue = requirement.getRequiredValue(nextSkillLevel);
-        		tv.setText(getRequirementDescription(requirement, requiredValue, res));
-        		boolean satisfiesRequirement = requirement.isSatisfiedByPlayer(player, nextSkillLevel);
-        		tv.setEnabled(!satisfiesRequirement);
-        		
-        		requirementList.addView(tv, requirementParams);
-        	}	
-        }
-        
+		app.setWindowParameters(this);
 
-        Button b = (Button) findViewById(R.id.skillinfoinfo_close);
-        b.setOnClickListener(new OnClickListener() {
+		setContentView(R.layout.skill_info_view);
+
+		final Resources res = getResources();
+		final Intent intent = getIntent();
+		final SkillCollection.SkillID skillID = SkillCollection.SkillID.valueOf(intent.getExtras().getString("skillID"));
+		SkillInfo skill = world.skills.getSkill(skillID);
+
+		TextView skillinfo_title = (TextView) findViewById(R.id.skillinfo_title);
+		skillinfo_title.setText(getSkillTitleResourceID(skillID));
+
+		TextView skillinfo_longdescription = (TextView) findViewById(R.id.skillinfo_longdescription);
+		skillinfo_longdescription.setText(getSkillLongDescription(skillID, res));
+
+		TextView skillinfo_currentlevel = (TextView) findViewById(R.id.skillinfo_currentlevel);
+		final int playerSkillLevel = player.getSkillLevel(skillID);
+		final int nextSkillLevel = playerSkillLevel + 1;
+		if (skill.hasMaxLevel()) {
+			skillinfo_currentlevel.setText(res.getString(R.string.skill_current_level_with_maximum, playerSkillLevel, skill.maxLevel));
+		} else if (player.hasSkill(skillID)) {
+			skillinfo_currentlevel.setText(res.getString(R.string.skill_current_level, playerSkillLevel));
+		} else {
+			skillinfo_currentlevel.setVisibility(View.GONE);
+		}
+
+
+		TextView skillinfo_requirement = (TextView) findViewById(R.id.skillinfo_requirement);
+		LayoutParams requirementParams = skillinfo_requirement.getLayoutParams();
+		ViewGroup requirementList = (ViewGroup) skillinfo_requirement.getParent();
+		requirementList.removeView(skillinfo_requirement);
+		if (shouldShowSkillRequirements(skill, playerSkillLevel)) {
+			for (SkillLevelRequirement requirement : skill.levelupRequirements) {
+				TextView tv = new TextView(this);
+				tv.setLayoutParams(requirementParams);
+
+				int requiredValue = requirement.getRequiredValue(nextSkillLevel);
+				tv.setText(getRequirementDescription(requirement, requiredValue, res));
+				boolean satisfiesRequirement = requirement.isSatisfiedByPlayer(player, nextSkillLevel);
+				tv.setEnabled(!satisfiesRequirement);
+
+				requirementList.addView(tv, requirementParams);
+			}
+		}
+
+
+		Button b = (Button) findViewById(R.id.skillinfoinfo_close);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				setResult(RESULT_CANCELED);
 				SkillInfoActivity.this.finish();
 			}
 		});
-        
-        b = (Button) findViewById(R.id.skillinfoinfo_action);
-        b.setOnClickListener(new OnClickListener() {
+
+		b = (Button) findViewById(R.id.skillinfoinfo_action);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				Intent result = new Intent();
@@ -94,16 +94,16 @@ public final class SkillInfoActivity extends Activity {
 				SkillInfoActivity.this.finish();
 			}
 		});
-        b.setEnabled(SkillController.canLevelupSkillManually(player, skill));
-    }
-	
+		b.setEnabled(SkillController.canLevelupSkillManually(player, skill));
+	}
+
 	private static boolean shouldShowSkillRequirements(SkillInfo skill, int playerSkillLevel) {
 		if (!skill.hasLevelupRequirements()) return false;
 		if (!skill.hasMaxLevel()) return true;
 		if (playerSkillLevel >= skill.maxLevel) return false;
 		return true;
 	}
-	
+
 	public static int getSkillTitleResourceID(SkillCollection.SkillID skill) {
 		switch (skill) {
 		case weaponChance: return R.string.skill_title_weapon_chance;
@@ -152,7 +152,7 @@ public final class SkillInfoActivity extends Activity {
 			return -1;
 		}
 	}
-	
+
 	private static String getSkillLongDescription(final SkillCollection.SkillID skill, final Resources res) {
 		switch (skill) {
 		case weaponChance: return res.getString(R.string.skill_longdescription_weapon_chance, SkillCollection.PER_SKILLPOINT_INCREASE_WEAPON_CHANCE);
@@ -201,7 +201,7 @@ public final class SkillInfoActivity extends Activity {
 			return "";
 		}
 	}
-	
+
 	private static String getRequirementDescription(SkillLevelRequirement requirement, int requiredValue, final Resources res) {
 		switch (requirement.requirementType) {
 		case skillLevel:
@@ -215,7 +215,7 @@ public final class SkillInfoActivity extends Activity {
 		}
 		return "";
 	}
-	
+
 	private static int getRequirementPlayerStatsResourceID(String statID) {
 		return getRequirementPlayerStatsResourceID(Player.StatID.valueOf(statID));
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
index 531c37fe1..85c22ac77 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
@@ -25,41 +25,41 @@ import android.view.View.OnClickListener;
 public final class StartScreenActivity extends Activity {
 
 	public static final int INTENTREQUEST_PREFERENCES = 7;
-    public static final int INTENTREQUEST_LOADGAME = 9;
-    
+	public static final int INTENTREQUEST_LOADGAME = 9;
+
 	private boolean hasExistingGame = false;
 	private Button startscreen_continue;
 	private Button startscreen_newgame;
 	private Button startscreen_load;
 	private TextView startscreen_currenthero;
 	private EditText startscreen_enterheroname;
-	
+
 	@Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
 
-        final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
-        app.setWindowParameters(this);
-		
-        setContentView(R.layout.startscreen);
+		final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
+		app.setWindowParameters(this);
 
-        TextView tv = (TextView) findViewById(R.id.startscreen_version);
-        tv.setText('v' + AndorsTrailApplication.CURRENT_VERSION_DISPLAY);
-        
-        startscreen_currenthero = (TextView) findViewById(R.id.startscreen_currenthero);
-        startscreen_enterheroname = (EditText) findViewById(R.id.startscreen_enterheroname);
-        //startscreen_enterheroname.setImeOptions(EditorInfo.IME_ACTION_DONE);
+		setContentView(R.layout.startscreen);
 
-        startscreen_continue = (Button) findViewById(R.id.startscreen_continue);
-        startscreen_continue.setOnClickListener(new OnClickListener() {
+		TextView tv = (TextView) findViewById(R.id.startscreen_version);
+		tv.setText('v' + AndorsTrailApplication.CURRENT_VERSION_DISPLAY);
+
+		startscreen_currenthero = (TextView) findViewById(R.id.startscreen_currenthero);
+		startscreen_enterheroname = (EditText) findViewById(R.id.startscreen_enterheroname);
+		//startscreen_enterheroname.setImeOptions(EditorInfo.IME_ACTION_DONE);
+
+		startscreen_continue = (Button) findViewById(R.id.startscreen_continue);
+		startscreen_continue.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				continueGame(false, Savegames.SLOT_QUICKSAVE, null);
 			}
 		});
-        
-        startscreen_newgame = (Button) findViewById(R.id.startscreen_newgame);
-        startscreen_newgame.setOnClickListener(new OnClickListener() {
+
+		startscreen_newgame = (Button) findViewById(R.id.startscreen_newgame);
+		startscreen_newgame.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				if (hasExistingGame) {
@@ -69,9 +69,9 @@ public final class StartScreenActivity extends Activity {
 				}
 			}
 		});
-        
-        Button b = (Button) findViewById(R.id.startscreen_about);
-        b.setOnClickListener(new OnClickListener() {
+
+		Button b = (Button) findViewById(R.id.startscreen_about);
+		b.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				startActivity(new Intent(StartScreenActivity.this, AboutActivity.class));
@@ -86,9 +86,9 @@ public final class StartScreenActivity extends Activity {
 				startActivityForResult(intent, INTENTREQUEST_PREFERENCES);
 			}
 		});
-        
-        startscreen_load = (Button) findViewById(R.id.startscreen_load);
-        startscreen_load.setOnClickListener(new OnClickListener() {
+
+		startscreen_load = (Button) findViewById(R.id.startscreen_load);
+		startscreen_load.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				Dialogs.showLoad(StartScreenActivity.this);
@@ -96,30 +96,30 @@ public final class StartScreenActivity extends Activity {
 		});
 
 		TextView development_version = (TextView) findViewById(R.id.startscreen_dev_version);
-        if (AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAMES) {
+		if (AndorsTrailApplication.DEVELOPMENT_INCOMPATIBLE_SAVEGAMES) {
 			development_version.setText(R.string.startscreen_incompatible_savegames);
-            development_version.setVisibility(View.VISIBLE);
-        } else if (!AndorsTrailApplication.IS_RELEASE_VERSION) {
+			development_version.setVisibility(View.VISIBLE);
+		} else if (!AndorsTrailApplication.IS_RELEASE_VERSION) {
 			development_version.setText(R.string.startscreen_non_release_version);
 			development_version.setVisibility(View.VISIBLE);
 		}
-        
-        final Resources res = getResources();
-        TileManager tileManager = app.getWorld().tileManager;
-        tileManager.setDensity(res);
-        updatePreferences();
-        app.getWorldSetup().startResourceLoader(res);
-        
-        if (AndorsTrailApplication.DEVELOPMENT_FORCE_STARTNEWGAME) {
-        	if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
-        		continueGame(true, 0, "Debug player");
-        	} else {
-        		continueGame(true, 0, "Player");
-        	}
-        } else if (AndorsTrailApplication.DEVELOPMENT_FORCE_CONTINUEGAME) {
-        	continueGame(false, Savegames.SLOT_QUICKSAVE, null);
-        }
-    }
+
+		final Resources res = getResources();
+		TileManager tileManager = app.getWorld().tileManager;
+		tileManager.setDensity(res);
+		updatePreferences();
+		app.getWorldSetup().startResourceLoader(res);
+
+		if (AndorsTrailApplication.DEVELOPMENT_FORCE_STARTNEWGAME) {
+			if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
+				continueGame(true, 0, "Debug player");
+			} else {
+				continueGame(true, 0, "Player");
+			}
+		} else if (AndorsTrailApplication.DEVELOPMENT_FORCE_CONTINUEGAME) {
+			continueGame(false, Savegames.SLOT_QUICKSAVE, null);
+		}
+	}
 
 	private void updatePreferences() {
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this);
@@ -127,38 +127,38 @@ public final class StartScreenActivity extends Activity {
 		preferences.read(this);
 		app.getWorld().tileManager.updatePreferences(preferences);
 	}
-	
+
 	@Override
 	protected void onResume() {
 		super.onResume();
-		
+
 		String playerName;
 		String displayInfo = null;
-		
+
 		FileHeader header = Savegames.quickload(this, Savegames.SLOT_QUICKSAVE);
 		if (header != null && header.playerName != null) {
 			playerName = header.playerName;
 			displayInfo = header.displayInfo;
 		} else {
-			// Before fileversion 14 (v0.6.7), quicksave was stored in Shared preferences 
+			// Before fileversion 14 (v0.6.7), quicksave was stored in Shared preferences
 			SharedPreferences p = getSharedPreferences("quicksave", MODE_PRIVATE);
 			playerName = p.getString("playername", null);
-            if (playerName != null) {
-            	displayInfo = "level " + p.getInt("level", -1);
-            }
+			if (playerName != null) {
+				displayInfo = "level " + p.getInt("level", -1);
+			}
 		}
 		hasExistingGame = (playerName != null);
 		setButtonState(playerName, displayInfo);
-		
+
 		if (isNewVersion()) {
 			Dialogs.showNewVersion(this);
 		}
-		
+
 		boolean hasSavegames = !Savegames.getUsedSavegameSlots(this).isEmpty();
 		startscreen_load.setEnabled(hasSavegames);
 	}
-	
-    @Override
+
+	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		switch (requestCode) {
@@ -172,7 +172,7 @@ public final class StartScreenActivity extends Activity {
 			break;
 		}
 	}
-	
+
 	private boolean isNewVersion() {
 		final String v = "lastversion";
 		SharedPreferences s = getSharedPreferences(Constants.PREFERENCE_MODEL_LASTRUNVERSION, MODE_PRIVATE);
@@ -187,15 +187,15 @@ public final class StartScreenActivity extends Activity {
 
 	private void setButtonState(final String playerName, final String displayInfo) {
 		startscreen_continue.setEnabled(hasExistingGame);
-        startscreen_newgame.setEnabled(true);
-        if (hasExistingGame) {
-        	startscreen_currenthero.setText(playerName  + ", " + displayInfo);
-        	startscreen_enterheroname.setText(playerName);
-    		startscreen_enterheroname.setVisibility(View.GONE);
-        } else {
-        	startscreen_currenthero.setText(R.string.startscreen_enterheroname);
-        	startscreen_enterheroname.setVisibility(View.VISIBLE);
-        }
+		startscreen_newgame.setEnabled(true);
+		if (hasExistingGame) {
+			startscreen_currenthero.setText(playerName + ", " + displayInfo);
+			startscreen_enterheroname.setText(playerName);
+			startscreen_enterheroname.setVisibility(View.GONE);
+		} else {
+			startscreen_currenthero.setText(R.string.startscreen_enterheroname);
+			startscreen_enterheroname.setVisibility(View.VISIBLE);
+		}
 	}
 
 	private void continueGame(boolean createNewCharacter, int loadFromSlot, String name) {
@@ -203,7 +203,7 @@ public final class StartScreenActivity extends Activity {
 		setup.createNewCharacter = createNewCharacter;
 		setup.loadFromSlot = loadFromSlot;
 		setup.newHeroName = name;
-        startActivity(new Intent(this, LoadingActivity.class));
+		startActivity(new Intent(this, LoadingActivity.class));
 	}
 
 	private void createNewGame() {
@@ -214,13 +214,13 @@ public final class StartScreenActivity extends Activity {
 		}
 		continueGame(true, 0, name);
 	}
-	
+
 	private void comfirmNewGame() {
 		new AlertDialog.Builder(this)
-        .setTitle(R.string.startscreen_newgame)
-        .setMessage(R.string.startscreen_newgame_confirm)
-        .setIcon(android.R.drawable.ic_delete)
-        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+		.setTitle(R.string.startscreen_newgame)
+		.setMessage(R.string.startscreen_newgame_confirm)
+		.setIcon(android.R.drawable.ic_delete)
+		.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
 				//continueGame(true);
@@ -228,7 +228,7 @@ public final class StartScreenActivity extends Activity {
 				setButtonState(null, null);
 			}
 		})
-        .setNegativeButton(android.R.string.cancel, null)
-        .create().show(); 
+		.setNegativeButton(android.R.string.cancel, null)
+		.create().show();
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
index 3cc8df7ff..679bcaaed 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
@@ -40,31 +40,31 @@ public final class HeroinfoActivity_Inventory extends Fragment {
 	private ItemContainerAdapter inventoryListAdapter;
 
 	private TextView heroinfo_stats_gold;
-    private TextView heroinfo_stats_attack;
-    private TextView heroinfo_stats_defense;
-    
-    private ItemType lastSelectedItem; // Workaround android bug #7139
-	
+	private TextView heroinfo_stats_attack;
+	private TextView heroinfo_stats_defense;
+
+	private ItemType lastSelectedItem; // Workaround android bug #7139
+
 	private final ImageView[] wornItemImage = new ImageView[Inventory.WearSlot.values().length];
 	private final int[] defaultWornItemImageResourceIDs = new int[Inventory.WearSlot.values().length];
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
 		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity());
 		if (!app.isInitialized()) return;
-        this.world = app.getWorld();
-        this.controllers = app.getControllerContext();
-        this.player = world.model.player;
+		this.world = app.getWorld();
+		this.controllers = app.getControllerContext();
+		this.player = world.model.player;
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.heroinfo_inventory, container, false);
-        
+
 		ListView inventoryList = (ListView) v.findViewById(R.id.inventorylist_root);
-        registerForContextMenu(inventoryList);
-        inventoryList.setOnItemClickListener(new OnItemClickListener() {
+		registerForContextMenu(inventoryList);
+		inventoryList.setOnItemClickListener(new OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
 				ItemType itemType = inventoryListAdapter.getItem(position).itemType;
@@ -72,38 +72,38 @@ public final class HeroinfoActivity_Inventory extends Fragment {
 			}
 		});
 		ItemContainer inv = player.inventory;
-        wornTiles = world.tileManager.loadTilesFor(player.inventory, getResources());
-        inventoryListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, inv, player, wornTiles);
-        inventoryList.setAdapter(inventoryListAdapter);
-        
-        heroinfo_stats_gold = (TextView) v.findViewById(R.id.heroinfo_stats_gold);
-        heroinfo_stats_attack = (TextView) v.findViewById(R.id.heroinfo_stats_attack);
-        heroinfo_stats_defense = (TextView) v.findViewById(R.id.heroinfo_stats_defense);
-        
-        setWearSlot(v, Inventory.WearSlot.weapon, R.id.heroinfo_worn_weapon, R.drawable.equip_weapon);
-        setWearSlot(v, Inventory.WearSlot.shield, R.id.heroinfo_worn_shield, R.drawable.equip_shield);
-        setWearSlot(v, Inventory.WearSlot.head, R.id.heroinfo_worn_head, R.drawable.equip_head);
-        setWearSlot(v, Inventory.WearSlot.body, R.id.heroinfo_worn_body, R.drawable.equip_body);
-        setWearSlot(v, Inventory.WearSlot.feet, R.id.heroinfo_worn_feet, R.drawable.equip_feet);
-        setWearSlot(v, Inventory.WearSlot.neck, R.id.heroinfo_worn_neck, R.drawable.equip_neck);
-        setWearSlot(v, Inventory.WearSlot.hand, R.id.heroinfo_worn_hand, R.drawable.equip_hand);
-        setWearSlot(v, Inventory.WearSlot.leftring, R.id.heroinfo_worn_ringleft, R.drawable.equip_ring);
-        setWearSlot(v, Inventory.WearSlot.rightring, R.id.heroinfo_worn_ringright, R.drawable.equip_ring);
+		wornTiles = world.tileManager.loadTilesFor(player.inventory, getResources());
+		inventoryListAdapter = new ItemContainerAdapter(getActivity(), world.tileManager, inv, player, wornTiles);
+		inventoryList.setAdapter(inventoryListAdapter);
+
+		heroinfo_stats_gold = (TextView) v.findViewById(R.id.heroinfo_stats_gold);
+		heroinfo_stats_attack = (TextView) v.findViewById(R.id.heroinfo_stats_attack);
+		heroinfo_stats_defense = (TextView) v.findViewById(R.id.heroinfo_stats_defense);
+
+		setWearSlot(v, Inventory.WearSlot.weapon, R.id.heroinfo_worn_weapon, R.drawable.equip_weapon);
+		setWearSlot(v, Inventory.WearSlot.shield, R.id.heroinfo_worn_shield, R.drawable.equip_shield);
+		setWearSlot(v, Inventory.WearSlot.head, R.id.heroinfo_worn_head, R.drawable.equip_head);
+		setWearSlot(v, Inventory.WearSlot.body, R.id.heroinfo_worn_body, R.drawable.equip_body);
+		setWearSlot(v, Inventory.WearSlot.feet, R.id.heroinfo_worn_feet, R.drawable.equip_feet);
+		setWearSlot(v, Inventory.WearSlot.neck, R.id.heroinfo_worn_neck, R.drawable.equip_neck);
+		setWearSlot(v, Inventory.WearSlot.hand, R.id.heroinfo_worn_hand, R.drawable.equip_hand);
+		setWearSlot(v, Inventory.WearSlot.leftring, R.id.heroinfo_worn_ringleft, R.drawable.equip_ring);
+		setWearSlot(v, Inventory.WearSlot.rightring, R.id.heroinfo_worn_ringright, R.drawable.equip_ring);
 
 		return v;
-    }
+	}
 
-    @Override
+	@Override
 	public void onStart() {
 		super.onStart();
-    	update();
-    }
+		update();
+	}
 
 	private void setWearSlot(final View v, final Inventory.WearSlot inventorySlot, int viewId, int resourceId) {
-    	final ImageView imageView = (ImageView) v.findViewById(viewId);
-    	wornItemImage[inventorySlot.ordinal()] = imageView;
-    	defaultWornItemImageResourceIDs[inventorySlot.ordinal()] = resourceId;
-    	imageView.setOnClickListener(new OnClickListener() {
+		final ImageView imageView = (ImageView) v.findViewById(viewId);
+		wornItemImage[inventorySlot.ordinal()] = imageView;
+		defaultWornItemImageResourceIDs[inventorySlot.ordinal()] = resourceId;
+		imageView.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {
 				if (player.inventory.isEmptySlot(inventorySlot)) return;
@@ -119,22 +119,22 @@ public final class HeroinfoActivity_Inventory extends Fragment {
 		switch (requestCode) {
 		case INTENTREQUEST_ITEMINFO:
 			if (resultCode != Activity.RESULT_OK) break;
-			
+
 			ItemType itemType = world.itemTypes.getItemType(data.getExtras().getString("itemTypeID"));
 			ItemInfoActivity.ItemInfoAction actionType = ItemInfoActivity.ItemInfoAction.valueOf(data.getExtras().getString("actionType"));
 			if (actionType == ItemInfoActivity.ItemInfoAction.unequip) {
 				Inventory.WearSlot slot = Inventory.WearSlot.valueOf(data.getExtras().getString("inventorySlot"));
-	        	controllers.itemController.unequipSlot(itemType, slot);
-	        } else  if (actionType == ItemInfoActivity.ItemInfoAction.equip) {
+				controllers.itemController.unequipSlot(itemType, slot);
+			} else if (actionType == ItemInfoActivity.ItemInfoAction.equip) {
 				Inventory.WearSlot slot = suggestInventorySlot(itemType);
-	        	controllers.itemController.equipItem(itemType, slot);
-	        } else  if (actionType == ItemInfoActivity.ItemInfoAction.use) {
+				controllers.itemController.equipItem(itemType, slot);
+			} else if (actionType == ItemInfoActivity.ItemInfoAction.use) {
 				controllers.itemController.useItem(itemType);
 			}
 			break;
 		case INTENTREQUEST_BULKSELECT_DROP:
 			if (resultCode != Activity.RESULT_OK) break;
-			
+
 			int quantity = data.getExtras().getInt("selectedAmount");
 			String itemTypeID = data.getExtras().getString("itemTypeID");
 			dropItem(itemTypeID, quantity);
@@ -146,7 +146,7 @@ public final class HeroinfoActivity_Inventory extends Fragment {
 	private Inventory.WearSlot suggestInventorySlot(ItemType itemType) {
 		Inventory.WearSlot slot = itemType.category.inventorySlot;
 		if (player.inventory.isEmptySlot(slot)) return slot;
-		
+
 		if (slot == Inventory.WearSlot.leftring) return Inventory.WearSlot.rightring;
 		if (itemType.isOffhandCapableWeapon()) {
 			ItemType mainWeapon = player.inventory.getItemTypeInWearSlot(Inventory.WearSlot.weapon);
@@ -168,30 +168,30 @@ public final class HeroinfoActivity_Inventory extends Fragment {
 	}
 
 	private void updateTraits() {
-        heroinfo_stats_gold.setText(getResources().getString(R.string.heroinfo_gold, player.inventory.gold));
-        
-        StringBuilder sb = new StringBuilder(10);
-        ItemController.describeAttackEffect(
-        		player.getAttackChance(), 
-        		player.getDamagePotential().current, 
-        		player.getDamagePotential().max, 
-        		player.getCriticalSkill(), 
-        		player.getCriticalMultiplier(), 
-        		sb);
-        heroinfo_stats_attack.setText(sb.toString());
-        
-        sb = new StringBuilder(10);
-        ItemController.describeBlockEffect(player.getBlockChance(), player.getDamageResistance(), sb);
-        heroinfo_stats_defense.setText(sb.toString());
-    }
+		heroinfo_stats_gold.setText(getResources().getString(R.string.heroinfo_gold, player.inventory.gold));
 
-    private void updateWorn() {
-    	for(Inventory.WearSlot slot : Inventory.WearSlot.values()) {
-    		updateWornImage(wornItemImage[slot.ordinal()], defaultWornItemImageResourceIDs[slot.ordinal()], player.inventory.getItemTypeInWearSlot(slot));
-    	}
-    }
+		StringBuilder sb = new StringBuilder(10);
+		ItemController.describeAttackEffect(
+				player.getAttackChance(),
+				player.getDamagePotential().current,
+				player.getDamagePotential().max,
+				player.getCriticalSkill(),
+				player.getCriticalMultiplier(),
+				sb);
+		heroinfo_stats_attack.setText(sb.toString());
 
-    private void updateWornImage(ImageView imageView, int resourceIDEmptyImage, ItemType type) {
+		sb = new StringBuilder(10);
+		ItemController.describeBlockEffect(player.getBlockChance(), player.getDamageResistance(), sb);
+		heroinfo_stats_defense.setText(sb.toString());
+	}
+
+	private void updateWorn() {
+		for(Inventory.WearSlot slot : Inventory.WearSlot.values()) {
+			updateWornImage(wornItemImage[slot.ordinal()], defaultWornItemImageResourceIDs[slot.ordinal()], player.inventory.getItemTypeInWearSlot(slot));
+		}
+	}
+
+	private void updateWornImage(ImageView imageView, int resourceIDEmptyImage, ItemType type) {
 		if (type != null) {
 			world.tileManager.setImageViewTile(getResources(), imageView, type, wornTiles);
 		} else {
@@ -202,12 +202,12 @@ public final class HeroinfoActivity_Inventory extends Fragment {
 
 	private void updateItemList() {
 		inventoryListAdapter.notifyDataSetChanged();
-    }
+	}
 
 	@Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
 		super.onCreateContextMenu(menu, v, menuInfo);
-    	ItemType type = getSelectedItemType((AdapterContextMenuInfo) menuInfo);
+		ItemType type = getSelectedItemType((AdapterContextMenuInfo) menuInfo);
 		MenuInflater inflater = getActivity().getMenuInflater();
 		switch (v.getId()) {
 		case R.id.inventorylist_root:
@@ -224,15 +224,15 @@ public final class HeroinfoActivity_Inventory extends Fragment {
 			break;
 		}
 		lastSelectedItem = null;
-    }
+	}
 
-    private ItemType getSelectedItemType(AdapterContextMenuInfo info) {
-    	return inventoryListAdapter.getItem(info.position).itemType;
-    }
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-    	ItemType itemType;
-    	AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+	private ItemType getSelectedItemType(AdapterContextMenuInfo info) {
+		return inventoryListAdapter.getItem(info.position).itemType;
+	}
+	@Override
+	public boolean onContextItemSelected(MenuItem item) {
+		ItemType itemType;
+		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
 		switch (item.getItemId()) {
 		case R.id.inv_menu_info:
 			showInventoryItemInfo(getSelectedItemType(info));
@@ -289,55 +289,55 @@ public final class HeroinfoActivity_Inventory extends Fragment {
 		}
 		update();
 		return true;
-    }
+	}
 
 	private void showEquippedItemInfo(ItemType itemType, Inventory.WearSlot inventorySlot) {
-    	String text;
-    	boolean enabled = true;
-    	
-    	if (world.model.uiSelections.isInCombat) {
-    		int ap = world.model.player.getReequipCost();
-    		text = getResources().getString(R.string.iteminfo_action_unequip_ap, ap);
-    		if (ap > 0) {
-    			enabled = world.model.player.hasAPs(ap);
-    		}
-    	} else {
-    		text = getResources().getString(R.string.iteminfo_action_unequip);
-    	}
+		String text;
+		boolean enabled = true;
+
+		if (world.model.uiSelections.isInCombat) {
+			int ap = world.model.player.getReequipCost();
+			text = getResources().getString(R.string.iteminfo_action_unequip_ap, ap);
+			if (ap > 0) {
+				enabled = world.model.player.hasAPs(ap);
+			}
+		} else {
+			text = getResources().getString(R.string.iteminfo_action_unequip);
+		}
 		Intent intent = Dialogs.getIntentForItemInfo(getActivity(), itemType.id, ItemInfoActivity.ItemInfoAction.unequip, text, enabled, inventorySlot);
 		startActivityForResult(intent, INTENTREQUEST_ITEMINFO);
-    }
-    private void showInventoryItemInfo(String itemTypeID) { 
-    	showInventoryItemInfo(world.itemTypes.getItemType(itemTypeID)); 
-    }
-    private void showInventoryItemInfo(ItemType itemType) {
-    	String text = "";
-        int ap = 0;
-        boolean enabled = true;
+	}
+	private void showInventoryItemInfo(String itemTypeID) {
+		showInventoryItemInfo(world.itemTypes.getItemType(itemTypeID));
+	}
+	private void showInventoryItemInfo(ItemType itemType) {
+		String text = "";
+		int ap = 0;
+		boolean enabled = true;
 		ItemInfoActivity.ItemInfoAction action = ItemInfoActivity.ItemInfoAction.none;
-        final boolean isInCombat = world.model.uiSelections.isInCombat;
-    	if (itemType.isEquippable()) {
-    		if (isInCombat) {
-    			ap = world.model.player.getReequipCost();
-        		text = getResources().getString(R.string.iteminfo_action_equip_ap, ap);
-        	} else {
-        		text = getResources().getString(R.string.iteminfo_action_equip);
-        	}
-    		action = ItemInfoActivity.ItemInfoAction.equip;
-        } else if (itemType.isUsable()) {
-        	if (isInCombat) {
-        		ap = world.model.player.getUseItemCost();
-        		text = getResources().getString(R.string.iteminfo_action_use_ap, ap);
-        	} else {
-        		text = getResources().getString(R.string.iteminfo_action_use);
-    		}
-    		action = ItemInfoActivity.ItemInfoAction.use;
-        }
-    	if (isInCombat && ap > 0) {
-    		enabled = world.model.player.hasAPs(ap);
-    	}
+		final boolean isInCombat = world.model.uiSelections.isInCombat;
+		if (itemType.isEquippable()) {
+			if (isInCombat) {
+				ap = world.model.player.getReequipCost();
+				text = getResources().getString(R.string.iteminfo_action_equip_ap, ap);
+			} else {
+				text = getResources().getString(R.string.iteminfo_action_equip);
+			}
+			action = ItemInfoActivity.ItemInfoAction.equip;
+		} else if (itemType.isUsable()) {
+			if (isInCombat) {
+				ap = world.model.player.getUseItemCost();
+				text = getResources().getString(R.string.iteminfo_action_use_ap, ap);
+			} else {
+				text = getResources().getString(R.string.iteminfo_action_use);
+			}
+			action = ItemInfoActivity.ItemInfoAction.use;
+		}
+		if (isInCombat && ap > 0) {
+			enabled = world.model.player.hasAPs(ap);
+		}
 
 		Intent intent = Dialogs.getIntentForItemInfo(getActivity(), itemType.id, action, text, enabled, null);
 		startActivityForResult(intent, INTENTREQUEST_ITEMINFO);
-    }
+	}
 }
\ No newline at end of file
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
index 06182b251..c6c2cb596 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java
@@ -1,147 +1,147 @@
-package com.gpl.rpg.AndorsTrail.activity.fragment;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.*;
-import android.widget.AdapterView.OnItemSelectedListener;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.quest.Quest;
-import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public final class HeroinfoActivity_Quests extends Fragment {
-
-	private WorldContext world;
-	private Spinner questlog_includecompleted;
-	private SimpleExpandableListAdapter questlog_contents_adapter;
-
-	private Player player;
-	
-	private final List<Map<String, ?>> groupList = new ArrayList<Map<String, ?>>();
-	private final List<List<Map<String, ?>>> childList = new ArrayList<List<Map<String,?>>>();
-
-	@Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity());
-        if (!app.isInitialized()) return;
-        this.world = app.getWorld();
-        this.player = world.model.player;
-	}
-
-	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.questlog, container, false);
-
-		Context ctx = getActivity();
-
-    	questlog_includecompleted = (Spinner) v.findViewById(R.id.questlog_includecompleted);
-    	ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(ctx, R.array.questlog_includecompleted, android.R.layout.simple_spinner_item);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        questlog_includecompleted.setAdapter(adapter);
-        questlog_includecompleted.setOnItemSelectedListener(new OnItemSelectedListener() {
-			@Override
-			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-				world.model.uiSelections.selectedQuestFilter = questlog_includecompleted.getSelectedItemPosition();
-				reloadQuests();
-			}
-
-			@Override
-			public void onNothingSelected(AdapterView<?> arg0) {}
-		});
-    	questlog_includecompleted.setSelection(world.model.uiSelections.selectedQuestFilter);
-    	
-    	ExpandableListView questlog_contents = (ExpandableListView) v.findViewById(R.id.questlog_contents);
-    	questlog_contents_adapter = new SimpleExpandableListAdapter(
-				ctx
-    			, groupList 
-    			, android.R.layout.simple_expandable_list_item_2 
-                , new String[] { mn_questName, mn_questStatus }
-                , new int[] { android.R.id.text1, android.R.id.text2 }
-                , childList 
-                , R.layout.questlogentry
-                , new String[] { mn_logText }
-                , new int[] { R.id.questlog_entrytext }
-    		);
-    	questlog_contents.setAdapter(questlog_contents_adapter);
-
-		return v;
-    }
-
-	private static final String mn_questName = "questName";
-	private static final String mn_questStatus = "questStatus";
-	private static final String mn_logText = "logText";
-	
-	@Override
-	public void onStart() {
-		super.onStart();
-		update();
-	}
-
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		update();
-	}
-
-	private void update() {
-		reloadQuests();
-	}
-	
-	private void reloadQuests() {
-		groupList.clear();
-		childList.clear();
-		
-		for (Quest q : world.quests.getAllQuests()) {
-			if (!q.showInLog) continue; // Do not show
-			if (player.hasAnyQuestProgress(q.questID)) {
-				boolean isCompleted = q.isCompleted(player);
-				
-				int v = questlog_includecompleted.getSelectedItemPosition();
-				if (v == 0) { // Hide completed quests
-					if (isCompleted) continue;
-				} else if (v == 1) { // Include completed quests
-					// Always show.
-				} else if (v == 2) { // Only completed quests
-					if (!isCompleted) continue;
-				}
-				
-	            int statusResId;
-	    		if (isCompleted) {
-	    			statusResId = R.string.questlog_queststatus_completed;
-	    		} else {
-	    			statusResId = R.string.questlog_queststatus_inprogress;
-	    		}
-
-				Map<String, Object> item = new HashMap<String, Object>();
-	            item.put(mn_questName, q.name);
-	            item.put(mn_questStatus, getString(R.string.questlog_queststatus, getString(statusResId)));
-                groupList.add(item);
-
-	            List<Map<String, ?>> logItemList = new ArrayList<Map<String, ?>>();
-	            for (QuestLogEntry e : q.stages) {
-	    			if (e.logtext.length() <= 0) continue; // Do not show if displaytext is empty.
-	    			if (player.hasExactQuestProgress(q.questID, e.progress)) {
-	    				item = new HashMap<String, Object>();
-	                    item.put(mn_logText, e.logtext);
-	                    logItemList.add(item);
-	    			}
-	    		}
-	            childList.add(logItemList);
-			}
-		}
-		questlog_contents_adapter.notifyDataSetChanged();
-	}
-}
+package com.gpl.rpg.AndorsTrail.activity.fragment;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.*;
+import android.widget.AdapterView.OnItemSelectedListener;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public final class HeroinfoActivity_Quests extends Fragment {
+
+	private WorldContext world;
+	private Spinner questlog_includecompleted;
+	private SimpleExpandableListAdapter questlog_contents_adapter;
+
+	private Player player;
+
+	private final List<Map<String, ?>> groupList = new ArrayList<Map<String, ?>>();
+	private final List<List<Map<String, ?>>> childList = new ArrayList<List<Map<String,?>>>();
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity());
+		if (!app.isInitialized()) return;
+		this.world = app.getWorld();
+		this.player = world.model.player;
+	}
+
+	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+		View v = inflater.inflate(R.layout.questlog, container, false);
+
+		Context ctx = getActivity();
+
+		questlog_includecompleted = (Spinner) v.findViewById(R.id.questlog_includecompleted);
+		ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(ctx, R.array.questlog_includecompleted, android.R.layout.simple_spinner_item);
+		adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+		questlog_includecompleted.setAdapter(adapter);
+		questlog_includecompleted.setOnItemSelectedListener(new OnItemSelectedListener() {
+			@Override
+			public void onItemSelected(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
+				world.model.uiSelections.selectedQuestFilter = questlog_includecompleted.getSelectedItemPosition();
+				reloadQuests();
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> arg0) {}
+		});
+		questlog_includecompleted.setSelection(world.model.uiSelections.selectedQuestFilter);
+
+		ExpandableListView questlog_contents = (ExpandableListView) v.findViewById(R.id.questlog_contents);
+		questlog_contents_adapter = new SimpleExpandableListAdapter(
+				ctx
+				, groupList
+				, android.R.layout.simple_expandable_list_item_2
+				, new String[] { mn_questName, mn_questStatus }
+				, new int[] { android.R.id.text1, android.R.id.text2 }
+				, childList
+				, R.layout.questlogentry
+				, new String[] { mn_logText }
+				, new int[] { R.id.questlog_entrytext }
+			);
+		questlog_contents.setAdapter(questlog_contents_adapter);
+
+		return v;
+	}
+
+	private static final String mn_questName = "questName";
+	private static final String mn_questStatus = "questStatus";
+	private static final String mn_logText = "logText";
+
+	@Override
+	public void onStart() {
+		super.onStart();
+		update();
+	}
+
+	@Override
+	public void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		update();
+	}
+
+	private void update() {
+		reloadQuests();
+	}
+
+	private void reloadQuests() {
+		groupList.clear();
+		childList.clear();
+
+		for (Quest q : world.quests.getAllQuests()) {
+			if (!q.showInLog) continue; // Do not show
+			if (player.hasAnyQuestProgress(q.questID)) {
+				boolean isCompleted = q.isCompleted(player);
+
+				int v = questlog_includecompleted.getSelectedItemPosition();
+				if (v == 0) { // Hide completed quests
+					if (isCompleted) continue;
+				} else if (v == 1) { // Include completed quests
+					// Always show.
+				} else if (v == 2) { // Only completed quests
+					if (!isCompleted) continue;
+				}
+
+				int statusResId;
+				if (isCompleted) {
+					statusResId = R.string.questlog_queststatus_completed;
+				} else {
+					statusResId = R.string.questlog_queststatus_inprogress;
+				}
+
+				Map<String, Object> item = new HashMap<String, Object>();
+				item.put(mn_questName, q.name);
+				item.put(mn_questStatus, getString(R.string.questlog_queststatus, getString(statusResId)));
+				groupList.add(item);
+
+				List<Map<String, ?>> logItemList = new ArrayList<Map<String, ?>>();
+				for (QuestLogEntry e : q.stages) {
+					if (e.logtext.length() <= 0) continue; // Do not show if displaytext is empty.
+					if (player.hasExactQuestProgress(q.questID, e.progress)) {
+						item = new HashMap<String, Object>();
+						item.put(mn_logText, e.logtext);
+						logItemList.add(item);
+					}
+				}
+				childList.add(logItemList);
+			}
+		}
+		questlog_contents_adapter.notifyDataSetChanged();
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
index 4a1f28bb3..beeb35a6b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java
@@ -32,23 +32,23 @@ public final class HeroinfoActivity_Skills extends Fragment {
 	private TextView listskills_number_of_increases;
 
 	@Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
-        if (!app.isInitialized()) return;
-        this.world = app.getWorld();
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
+		if (!app.isInitialized()) return;
+		this.world = app.getWorld();
 		this.controllers = app.getControllerContext();
-        this.player = world.model.player;
+		this.player = world.model.player;
 	}
 
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.heroinfo_skill_list, container, false);
 
 		final Activity ctx = getActivity();
-        skillListAdapter = new SkillListAdapter(ctx, world.skills.getAllSkills(), player);
-        ListView skillList = (ListView) v.findViewById(R.id.heroinfo_listskills_list);
-        skillList.setAdapter(skillListAdapter);
-        skillList.setOnItemClickListener(new OnItemClickListener() {
+		skillListAdapter = new SkillListAdapter(ctx, world.skills.getAllSkills(), player);
+		ListView skillList = (ListView) v.findViewById(R.id.heroinfo_listskills_list);
+		skillList.setAdapter(skillListAdapter);
+		skillList.setOnItemClickListener(new OnItemClickListener() {
 			@Override
 			public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
 				Intent intent = Dialogs.getIntentForSkillInfo(ctx, skillListAdapter.getItem(position).id);
@@ -57,7 +57,7 @@ public final class HeroinfoActivity_Skills extends Fragment {
 		});
 		listskills_number_of_increases = (TextView) v.findViewById(R.id.heroinfo_listskills_number_of_increases);
 		return v;
-    }
+	}
 
 	@Override
 	public void onStart() {
@@ -84,7 +84,7 @@ public final class HeroinfoActivity_Skills extends Fragment {
 	}
 
 	private void updateSkillList() {
-        int numberOfSkillIncreases = player.getAvailableSkillIncreases();
+		int numberOfSkillIncreases = player.getAvailableSkillIncreases();
 		if (numberOfSkillIncreases > 0) {
 			if (numberOfSkillIncreases == 1) {
 				listskills_number_of_increases.setText(R.string.skill_number_of_increases_one);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
index 33ce3afa2..19857ec43 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java
@@ -35,28 +35,28 @@ public final class HeroinfoActivity_Stats extends Fragment {
 
 	private View view;
 	private Button levelUpButton;
-    private TextView heroinfo_ap;
-    private TextView heroinfo_reequip_cost;
-    private TextView heroinfo_useitem_cost;
-    private TextView heroinfo_level;
-    private TextView heroinfo_totalexperience;
-    private TextView basetraitsinfo_max_hp;
-    private TextView basetraitsinfo_max_ap;
-    private TextView heroinfo_base_reequip_cost;
-    private TextView heroinfo_base_useitem_cost;
-    private RangeBar rangebar_hp;
-    private RangeBar rangebar_exp;
-    private ItemEffectsView actorinfo_onhiteffects;
-    private TableLayout heroinfo_basestats_table;
-    private ViewGroup heroinfo_container;
+	private TextView heroinfo_ap;
+	private TextView heroinfo_reequip_cost;
+	private TextView heroinfo_useitem_cost;
+	private TextView heroinfo_level;
+	private TextView heroinfo_totalexperience;
+	private TextView basetraitsinfo_max_hp;
+	private TextView basetraitsinfo_max_ap;
+	private TextView heroinfo_base_reequip_cost;
+	private TextView heroinfo_base_useitem_cost;
+	private RangeBar rangebar_hp;
+	private RangeBar rangebar_exp;
+	private ItemEffectsView actorinfo_onhiteffects;
+	private TableLayout heroinfo_basestats_table;
+	private ViewGroup heroinfo_container;
 
 	@Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity());
-        if (!app.isInitialized()) return;
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(this.getActivity());
+		if (!app.isInitialized()) return;
 		this.world = app.getWorld();
-        this.player = world.model.player;
+		this.player = world.model.player;
 	}
 
 	@Override
@@ -64,50 +64,50 @@ public final class HeroinfoActivity_Stats extends Fragment {
 		View v = inflater.inflate(R.layout.heroinfo_stats, container, false);
 		view = v;
 
-        TextView tv = (TextView) v.findViewById(R.id.heroinfo_title);
-        tv.setText(player.getName());
-        world.tileManager.setImageViewTile(getResources(), tv, player);
-        
-        heroinfo_container = (ViewGroup) v.findViewById(R.id.heroinfo_container);
-        heroinfo_ap = (TextView) v.findViewById(R.id.heroinfo_ap);
-        heroinfo_reequip_cost = (TextView) v.findViewById(R.id.heroinfo_reequip_cost);
-        heroinfo_useitem_cost = (TextView) v.findViewById(R.id.heroinfo_useitem_cost);
-        basetraitsinfo_max_hp = (TextView) v.findViewById(R.id.basetraitsinfo_max_hp);
-        basetraitsinfo_max_ap = (TextView) v.findViewById(R.id.basetraitsinfo_max_ap);
-        heroinfo_base_reequip_cost = (TextView) v.findViewById(R.id.heroinfo_base_reequip_cost);
-        heroinfo_base_useitem_cost = (TextView) v.findViewById(R.id.heroinfo_base_useitem_cost);
-        heroinfo_level = (TextView) v.findViewById(R.id.heroinfo_level);
-        heroinfo_totalexperience = (TextView) v.findViewById(R.id.heroinfo_totalexperience);
+		TextView tv = (TextView) v.findViewById(R.id.heroinfo_title);
+		tv.setText(player.getName());
+		world.tileManager.setImageViewTile(getResources(), tv, player);
+
+		heroinfo_container = (ViewGroup) v.findViewById(R.id.heroinfo_container);
+		heroinfo_ap = (TextView) v.findViewById(R.id.heroinfo_ap);
+		heroinfo_reequip_cost = (TextView) v.findViewById(R.id.heroinfo_reequip_cost);
+		heroinfo_useitem_cost = (TextView) v.findViewById(R.id.heroinfo_useitem_cost);
+		basetraitsinfo_max_hp = (TextView) v.findViewById(R.id.basetraitsinfo_max_hp);
+		basetraitsinfo_max_ap = (TextView) v.findViewById(R.id.basetraitsinfo_max_ap);
+		heroinfo_base_reequip_cost = (TextView) v.findViewById(R.id.heroinfo_base_reequip_cost);
+		heroinfo_base_useitem_cost = (TextView) v.findViewById(R.id.heroinfo_base_useitem_cost);
+		heroinfo_level = (TextView) v.findViewById(R.id.heroinfo_level);
+		heroinfo_totalexperience = (TextView) v.findViewById(R.id.heroinfo_totalexperience);
 		actorinfo_onhiteffects = (ItemEffectsView) v.findViewById(R.id.actorinfo_onhiteffects);
 		heroinfo_basestats_table = (TableLayout) v.findViewById(R.id.heroinfo_basestats_table);
 
-        rangebar_hp = (RangeBar) v.findViewById(R.id.heroinfo_healthbar);
-        rangebar_hp.init(R.drawable.ui_progress_health, R.string.status_hp);
-        rangebar_exp = (RangeBar) v.findViewById(R.id.heroinfo_expbar);
-        rangebar_exp.init(R.drawable.ui_progress_exp, R.string.status_exp);
-        
-        levelUpButton = (Button) v.findViewById(R.id.heroinfo_levelup);
-        levelUpButton.setOnClickListener(new OnClickListener() {
+		rangebar_hp = (RangeBar) v.findViewById(R.id.heroinfo_healthbar);
+		rangebar_hp.init(R.drawable.ui_progress_health, R.string.status_hp);
+		rangebar_exp = (RangeBar) v.findViewById(R.id.heroinfo_expbar);
+		rangebar_exp.init(R.drawable.ui_progress_exp, R.string.status_exp);
+
+		levelUpButton = (Button) v.findViewById(R.id.heroinfo_levelup);
+		levelUpButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				Intent intent = Dialogs.getIntentForLevelUp(getActivity());
 				startActivityForResult(intent, INTENTREQUEST_LEVELUP);
-				// We disable the button temporarily, so that there is no possibility 
-				//  of clicking it again before the levelup activity has started.
+				// We disable the button temporarily, so that there is no possibility
+				// of clicking it again before the levelup activity has started.
 				// See issue:
-				//  http://code.google.com/p/andors-trail/issues/detail?id=42
+				// http://code.google.com/p/andors-trail/issues/detail?id=42
 				levelUpButton.setEnabled(false);
 			}
 		});
 
 		return v;
-    }
+	}
 
-    @Override
+	@Override
 	public void onStart() {
 		super.onStart();
 		update();
-    }
+	}
 
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
@@ -122,8 +122,8 @@ public final class HeroinfoActivity_Stats extends Fragment {
 
 	private void updateLevelup() {
 		levelUpButton.setEnabled(player.canLevelup());
-    }
-    
+	}
+
 	private void updateTraits() {
 		final Resources res = getResources();
 
@@ -136,24 +136,24 @@ public final class HeroinfoActivity_Stats extends Fragment {
 		basetraitsinfo_max_ap.setText(Integer.toString(player.baseTraits.maxAP));
 		heroinfo_base_reequip_cost.setText(Integer.toString(player.baseTraits.reequipCost));
 		heroinfo_base_useitem_cost.setText(Integer.toString(player.baseTraits.useItemCost));
-        rangebar_hp.update(player.getMaxHP(), player.getCurrentHP());
-        rangebar_exp.update(player.getMaxLevelExperience(), player.getCurrentLevelExperience());
-        
-        TraitsInfoView.update(heroinfo_container, player);
-        TraitsInfoView.updateTraitsTable(
-    		heroinfo_basestats_table
-    		, player.baseTraits.moveCost
-    		, player.baseTraits.attackCost
-    		, player.baseTraits.attackChance
-    		, player.baseTraits.damagePotential
-    		, player.baseTraits.criticalSkill
-    		, player.baseTraits.criticalMultiplier
-    		, player.baseTraits.blockChance
-    		, player.baseTraits.damageResistance
+		rangebar_hp.update(player.getMaxHP(), player.getCurrentHP());
+		rangebar_exp.update(player.getMaxLevelExperience(), player.getCurrentLevelExperience());
+
+		TraitsInfoView.update(heroinfo_container, player);
+		TraitsInfoView.updateTraitsTable(
+			heroinfo_basestats_table
+			, player.baseTraits.moveCost
+			, player.baseTraits.attackCost
+			, player.baseTraits.attackChance
+			, player.baseTraits.damagePotential
+			, player.baseTraits.criticalSkill
+			, player.baseTraits.criticalMultiplier
+			, player.baseTraits.blockChance
+			, player.baseTraits.damageResistance
 			, false
 		);
-        
-        ArrayList<ItemTraits_OnUse> effects_hit = new ArrayList<ItemTraits_OnUse>();
+
+		ArrayList<ItemTraits_OnUse> effects_hit = new ArrayList<ItemTraits_OnUse>();
 		ArrayList<ItemTraits_OnUse> effects_kill = new ArrayList<ItemTraits_OnUse>();
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
 			ItemType type = player.inventory.getItemTypeInWearSlot(slot);
@@ -176,7 +176,7 @@ public final class HeroinfoActivity_Stats extends Fragment {
 		updateStatsTableRow(world.model.statistics.getMostCommonlyUsedItem(world, res), R.id.heroinfo_gamestats_fav_item, R.id.heroinfo_gamestats_fav_item_row1, R.id.heroinfo_gamestats_fav_item_row2);
 		updateStatsTableRow(world.model.statistics.getMostPowerfulKilledMonster(world), R.id.heroinfo_gamestats_top_boss, R.id.heroinfo_gamestats_top_boss_row1, R.id.heroinfo_gamestats_top_boss_row2);
 		updateStatsTableRow(world.model.statistics.getTop5MostCommonlyKilledMonsters(world, res), R.id.heroinfo_gamestats_fav_monsters, R.id.heroinfo_gamestats_fav_monsters_row1, R.id.heroinfo_gamestats_fav_monsters_row2);
-    }
+	}
 
 	private void updateStatsTableRow(int value, int textView, int tableRow) {
 		String s = (value > 0) ? Integer.toString(value) : null;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
index d283fcb8e..2cc0ba64e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java
@@ -36,37 +36,37 @@ public abstract class ShopActivityFragment extends Fragment implements OnContain
 
 	protected abstract boolean isSellingInterface();
 
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        
-        final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
-        if (!app.isInitialized()) return;
-        this.world = app.getWorld();
-        this.player = world.model.player;
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		final AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivity(getActivity());
+		if (!app.isInitialized()) return;
+		this.world = app.getWorld();
+		this.player = world.model.player;
 	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.shoplist, container, false);
-        
-        final Monster npc = Dialogs.getMonsterFromIntent(getActivity().getIntent(), world);
 
-        final Resources res = getResources();
+		final Monster npc = Dialogs.getMonsterFromIntent(getActivity().getIntent(), world);
 
-        shop_gc = (TextView) v.findViewById(R.id.shop_gc);
+		final Resources res = getResources();
+
+		shop_gc = (TextView) v.findViewById(R.id.shop_gc);
 
 		ListView shoplist = (ListView) v.findViewById(R.id.shop_list);
 
 		shopInventory = npc.getShopItems(player);
-        
-        HashSet<Integer> iconIDs = world.tileManager.getTileIDsFor(shopInventory);
-        iconIDs.addAll(world.tileManager.getTileIDsFor(player.inventory));
-        TileCollection tiles = world.tileManager.loadTilesFor(iconIDs, res);
+
+		HashSet<Integer> iconIDs = world.tileManager.getTileIDsFor(shopInventory);
+		iconIDs.addAll(world.tileManager.getTileIDsFor(player.inventory));
+		TileCollection tiles = world.tileManager.loadTilesFor(iconIDs, res);
 		final boolean isSelling = isSellingInterface();
 		listAdapter = new ShopItemContainerAdapter(getActivity(), tiles, world.tileManager, player, isSelling ? player.inventory : shopInventory, this, isSelling);
-        shoplist.setAdapter(listAdapter);
-        return v;
+		shoplist.setAdapter(listAdapter);
+		return v;
 	}
 
 	@Override
@@ -85,12 +85,12 @@ public abstract class ShopActivityFragment extends Fragment implements OnContain
 		lastToast.show();
 		update();
 	}
-	
+
 	@Override
-    public void onPause() {
+	public void onPause() {
 		super.onPause();
-    	lastToast = null;
-    }
+		lastToast = null;
+	}
 
 	protected void update() {
 		listAdapter.notifyDataSetChanged();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
index 295cda57b..6725f2bdb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java
@@ -28,10 +28,10 @@ public final class ShopActivity_Buy extends ShopActivityFragment {
 		Intent intent = Dialogs.getIntentForItemInfo(getActivity(), itemType.id, ItemInfoActivity.ItemInfoAction.buy, text, enableButton, null);
 		startActivityForResult(intent, INTENTREQUEST_ITEMINFO);
 	}
-	
-    @Override
+
+	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    	super.onActivityResult(requestCode, resultCode, data);
+		super.onActivityResult(requestCode, resultCode, data);
 		if (resultCode != Activity.RESULT_OK) return;
 
 		ItemType itemType = world.itemTypes.getItemType(data.getExtras().getString("itemTypeID"));
@@ -51,7 +51,7 @@ public final class ShopActivity_Buy extends ShopActivityFragment {
 		Intent intent = Dialogs.getIntentForBulkBuyingInterface(getActivity(), itemType.id, shopInventory.getItemQuantity(itemType.id));
 		startActivityForResult(intent, INTENTREQUEST_BULKSELECT);
 	}
-	
+
 	private void buy(ItemType itemType, int quantity) {
 		if (!ItemController.buy(world.model, player, itemType, shopInventory, quantity)) return;
 		final String msg = getResources().getString(R.string.shop_item_bought, itemType.getName(player));
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
index bf7d56562..0397376e2 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java
@@ -29,9 +29,9 @@ public final class ShopActivity_Sell extends ShopActivityFragment {
 		startActivityForResult(intent, INTENTREQUEST_ITEMINFO);
 	}
 
-    @Override
+	@Override
 	public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    	super.onActivityResult(requestCode, resultCode, data);
+		super.onActivityResult(requestCode, resultCode, data);
 		if (resultCode != Activity.RESULT_OK) return;
 
 		ItemType itemType = world.itemTypes.getItemType(data.getExtras().getString("itemTypeID"));
@@ -47,7 +47,7 @@ public final class ShopActivity_Sell extends ShopActivityFragment {
 		update();
 	}
 
-    private void showSellingInterface(ItemType itemType) {
+	private void showSellingInterface(ItemType itemType) {
 		Intent intent = Dialogs.getIntentForBulkSellingInterface(getActivity(), itemType.id, player.inventory.getItemQuantity(itemType.id));
 		startActivityForResult(intent, INTENTREQUEST_BULKSELECT);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
index bc5a02e49..6b0f110f5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/ControllerContext.java
@@ -1,61 +1,61 @@
-package com.gpl.rpg.AndorsTrail.context;
-
-import java.lang.ref.WeakReference;
-
-import android.content.res.Resources;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail.controller.ActorStatsController;
-import com.gpl.rpg.AndorsTrail.controller.CombatController;
-import com.gpl.rpg.AndorsTrail.controller.MapController;
-import com.gpl.rpg.AndorsTrail.controller.ConversationController;
-import com.gpl.rpg.AndorsTrail.controller.GameRoundController;
-import com.gpl.rpg.AndorsTrail.controller.MonsterSpawningController;
-import com.gpl.rpg.AndorsTrail.controller.SkillController;
-import com.gpl.rpg.AndorsTrail.controller.VisualEffectController;
-import com.gpl.rpg.AndorsTrail.controller.ItemController;
-import com.gpl.rpg.AndorsTrail.controller.MonsterMovementController;
-import com.gpl.rpg.AndorsTrail.controller.MovementController;
-import com.gpl.rpg.AndorsTrail.controller.InputController;
-
-public final class ControllerContext {
-	//Controllers
-	public final MapController mapController;
-	public final GameRoundController gameRoundController;
-	public final CombatController combatController;
-	public final ConversationController conversationController;
-	public final VisualEffectController effectController;
-	public final ItemController itemController;
-	public final MonsterMovementController monsterMovementController;
-	public final MonsterSpawningController monsterSpawnController;
-	public final MovementController movementController;
-	public final ActorStatsController actorStatsController;
-	public final InputController inputController;
-	public final SkillController skillController;
-	
-	public final AndorsTrailPreferences preferences;
-	private final WeakReference<AndorsTrailApplication> app;
-	
-	public ControllerContext(AndorsTrailApplication app, WorldContext world) {
-		this.app = new WeakReference<AndorsTrailApplication>(app);
-		this.preferences = app.getPreferences();
-
-		this.mapController = new MapController(this, world);
-		this.gameRoundController = new GameRoundController(this, world);
-		this.combatController = new CombatController(this, world);
-		this.conversationController = new ConversationController(this, world);
-		this.effectController = new VisualEffectController(this, world);
-		this.itemController = new ItemController(this, world);
-		this.monsterMovementController = new MonsterMovementController(this, world);
-		this.monsterSpawnController = new MonsterSpawningController(this, world);
-		this.movementController = new MovementController(this, world);
-		this.actorStatsController = new ActorStatsController(this, world);
-		this.inputController = new InputController(this, world);
-		this.skillController = new SkillController(this, world);
-	}
-	
-	public Resources getResources() {
-		return app.get().getResources();
-	}
-}
+package com.gpl.rpg.AndorsTrail.context;
+
+import java.lang.ref.WeakReference;
+
+import android.content.res.Resources;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.controller.ActorStatsController;
+import com.gpl.rpg.AndorsTrail.controller.CombatController;
+import com.gpl.rpg.AndorsTrail.controller.MapController;
+import com.gpl.rpg.AndorsTrail.controller.ConversationController;
+import com.gpl.rpg.AndorsTrail.controller.GameRoundController;
+import com.gpl.rpg.AndorsTrail.controller.MonsterSpawningController;
+import com.gpl.rpg.AndorsTrail.controller.SkillController;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.controller.MonsterMovementController;
+import com.gpl.rpg.AndorsTrail.controller.MovementController;
+import com.gpl.rpg.AndorsTrail.controller.InputController;
+
+public final class ControllerContext {
+	//Controllers
+	public final MapController mapController;
+	public final GameRoundController gameRoundController;
+	public final CombatController combatController;
+	public final ConversationController conversationController;
+	public final VisualEffectController effectController;
+	public final ItemController itemController;
+	public final MonsterMovementController monsterMovementController;
+	public final MonsterSpawningController monsterSpawnController;
+	public final MovementController movementController;
+	public final ActorStatsController actorStatsController;
+	public final InputController inputController;
+	public final SkillController skillController;
+
+	public final AndorsTrailPreferences preferences;
+	private final WeakReference<AndorsTrailApplication> app;
+
+	public ControllerContext(AndorsTrailApplication app, WorldContext world) {
+		this.app = new WeakReference<AndorsTrailApplication>(app);
+		this.preferences = app.getPreferences();
+
+		this.mapController = new MapController(this, world);
+		this.gameRoundController = new GameRoundController(this, world);
+		this.combatController = new CombatController(this, world);
+		this.conversationController = new ConversationController(this, world);
+		this.effectController = new VisualEffectController(this, world);
+		this.itemController = new ItemController(this, world);
+		this.monsterMovementController = new MonsterMovementController(this, world);
+		this.monsterSpawnController = new MonsterSpawningController(this, world);
+		this.movementController = new MovementController(this, world);
+		this.actorStatsController = new ActorStatsController(this, world);
+		this.inputController = new InputController(this, world);
+		this.skillController = new SkillController(this, world);
+	}
+
+	public Resources getResources() {
+		return app.get().getResources();
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
index 3885da1c4..4e70f4b5a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/context/WorldContext.java
@@ -1,65 +1,65 @@
-package com.gpl.rpg.AndorsTrail.context;
-
-import com.gpl.rpg.AndorsTrail.VisualEffectCollection;
-import com.gpl.rpg.AndorsTrail.conversation.ConversationLoader;
-import com.gpl.rpg.AndorsTrail.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
-import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
-import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
-import com.gpl.rpg.AndorsTrail.model.item.ItemCategoryCollection;
-import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
-import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
-import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
-
-public final class WorldContext {
-	//Objectcollections
-	public final ConversationLoader conversationLoader;
-	public final ItemTypeCollection itemTypes;
-	public final ItemCategoryCollection itemCategories;
-	public final MonsterTypeCollection monsterTypes;
-	public final VisualEffectCollection visualEffectTypes;
-	public final DropListCollection dropLists;
-	public final QuestCollection quests;
-	public final ActorConditionTypeCollection actorConditionsTypes;
-	public final SkillCollection skills;
-
-	//Objectcollections
-	public final TileManager tileManager;
-
-	//Model
-	public final MapCollection maps;
-	public ModelContainer model;
-	
-	public WorldContext() {
-		this.conversationLoader = new ConversationLoader();
-		this.itemTypes = new ItemTypeCollection();
-		this.itemCategories = new ItemCategoryCollection();
-		this.monsterTypes = new MonsterTypeCollection();
-		this.visualEffectTypes = new VisualEffectCollection();
-		this.dropLists = new DropListCollection();
-		this.tileManager = new TileManager();
-		this.maps = new MapCollection();
-		this.quests = new QuestCollection();
-		this.actorConditionsTypes = new ActorConditionTypeCollection();
-		this.skills = new SkillCollection();
-	}
-	public WorldContext(WorldContext copy) {
-		this.conversationLoader = copy.conversationLoader;
-		this.itemTypes = copy.itemTypes;
-		this.itemCategories = copy.itemCategories;
-		this.monsterTypes = copy.monsterTypes;
-		this.visualEffectTypes = copy.visualEffectTypes;
-		this.dropLists = copy.dropLists;
-		this.tileManager = copy.tileManager;
-		this.maps = copy.maps;
-		this.quests = copy.quests;
-		this.model = copy.model;
-		this.actorConditionsTypes = copy.actorConditionsTypes;
-		this.skills = copy.skills;
-	}
-	public void reset() {
-		maps.reset();
-	}
-}
+package com.gpl.rpg.AndorsTrail.context;
+
+import com.gpl.rpg.AndorsTrail.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.conversation.ConversationLoader;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemCategoryCollection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+
+public final class WorldContext {
+	//Objectcollections
+	public final ConversationLoader conversationLoader;
+	public final ItemTypeCollection itemTypes;
+	public final ItemCategoryCollection itemCategories;
+	public final MonsterTypeCollection monsterTypes;
+	public final VisualEffectCollection visualEffectTypes;
+	public final DropListCollection dropLists;
+	public final QuestCollection quests;
+	public final ActorConditionTypeCollection actorConditionsTypes;
+	public final SkillCollection skills;
+
+	//Objectcollections
+	public final TileManager tileManager;
+
+	//Model
+	public final MapCollection maps;
+	public ModelContainer model;
+
+	public WorldContext() {
+		this.conversationLoader = new ConversationLoader();
+		this.itemTypes = new ItemTypeCollection();
+		this.itemCategories = new ItemCategoryCollection();
+		this.monsterTypes = new MonsterTypeCollection();
+		this.visualEffectTypes = new VisualEffectCollection();
+		this.dropLists = new DropListCollection();
+		this.tileManager = new TileManager();
+		this.maps = new MapCollection();
+		this.quests = new QuestCollection();
+		this.actorConditionsTypes = new ActorConditionTypeCollection();
+		this.skills = new SkillCollection();
+	}
+	public WorldContext(WorldContext copy) {
+		this.conversationLoader = copy.conversationLoader;
+		this.itemTypes = copy.itemTypes;
+		this.itemCategories = copy.itemCategories;
+		this.monsterTypes = copy.monsterTypes;
+		this.visualEffectTypes = copy.visualEffectTypes;
+		this.dropLists = copy.dropLists;
+		this.tileManager = copy.tileManager;
+		this.maps = copy.maps;
+		this.quests = copy.quests;
+		this.model = copy.model;
+		this.actorConditionsTypes = copy.actorConditionsTypes;
+		this.skills = copy.skills;
+	}
+	public void reset() {
+		maps.reset();
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
index 72636871c..8515ebacd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java
@@ -32,9 +32,9 @@ public final class ActorStatsController {
 	public final PlayerStatsListeners playerStatsListeners = new PlayerStatsListeners();
 
 	public ActorStatsController(ControllerContext controllers, WorldContext world) {
-    	this.controllers = controllers;
-    	this.world = world;
-    }
+		this.controllers = controllers;
+		this.world = world;
+	}
 
 	public void addConditionsFromEquippedItem(Player player, ItemType itemType) {
 		ItemTraits_OnEquip equipEffects = itemType.effects_equip;
@@ -64,7 +64,7 @@ public final class ActorStatsController {
 			ActorCondition c = actor.conditions.get(i);
 			if (!type.conditionTypeID.equals(c.conditionType.conditionTypeID)) continue;
 			if (c.duration != duration) continue;
-			
+
 			if (c.magnitude > magnitude) {
 				c.magnitude -= magnitude;
 				actorConditionListeners.onActorConditionMagnitudeChanged(actor, c);
@@ -80,7 +80,7 @@ public final class ActorStatsController {
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
 			ItemType t = player.inventory.getItemTypeInWearSlot(slot);
 			if (t == null) continue;
-		
+
 			ItemTraits_OnEquip equipEffects = t.effects_equip;
 			if (equipEffects == null) continue;
 			if (equipEffects.addedConditions == null) continue;
@@ -93,7 +93,7 @@ public final class ActorStatsController {
 		}
 		removeStackableActorCondition(player, type, magnitude, duration);
 	}
-	
+
 	public void applyActorCondition(Actor actor, ActorConditionEffect e) { applyActorCondition(actor, e, e.duration); }
 	private void applyActorCondition(Actor actor, ActorConditionEffect e, int duration) {
 		if (e.isRemovalEffect()) {
@@ -111,7 +111,7 @@ public final class ActorStatsController {
 	private void addStackableActorCondition(Actor actor, ActorConditionEffect e, int duration) {
 		final ActorConditionType type = e.conditionType;
 		int magnitude = e.magnitude;
-		
+
 		for(int i = actor.conditions.size() - 1; i >= 0; --i) {
 			ActorCondition c = actor.conditions.get(i);
 			if (!type.conditionTypeID.equals(c.conditionType.conditionTypeID)) continue;
@@ -128,7 +128,7 @@ public final class ActorStatsController {
 	}
 	private void addNonStackableActorCondition(Actor actor, ActorConditionEffect e, int duration) {
 		final ActorConditionType type = e.conditionType;
-		
+
 		for(int i = actor.conditions.size() - 1; i >= 0; --i) {
 			ActorCondition c = actor.conditions.get(i);
 			if (!type.conditionTypeID.equals(c.conditionType.conditionTypeID)) continue;
@@ -140,7 +140,7 @@ public final class ActorStatsController {
 			actor.conditions.remove(i);
 			actorConditionListeners.onActorConditionRemoved(actor, c);
 		}
-		
+
 		ActorCondition c = e.createCondition(duration);
 		actor.conditions.add(c);
 		actorConditionListeners.onActorConditionAdded(actor, c);
@@ -154,7 +154,7 @@ public final class ActorStatsController {
 			actorConditionListeners.onActorConditionRemoved(actor, c);
 		}
 	}
-	
+
 	private void removeAllConditionsOfType(final Actor actor, final String conditionTypeID) {
 		for(int i = actor.conditions.size() - 1; i >= 0; --i) {
 			ActorCondition c = actor.conditions.get(i);
@@ -163,19 +163,19 @@ public final class ActorStatsController {
 			actorConditionListeners.onActorConditionRemoved(actor, c);
 		}
 	}
-	
+
 	private void applyEffectsFromCurrentConditions(Actor actor) {
 		for (ActorCondition c : actor.conditions) {
 			applyAbilityEffects(actor, c.conditionType.abilityEffect, c.magnitude);
 		}
 	}
-	
+
 	public void applyAbilityEffects(Actor actor, AbilityModifierTraits effects, int multiplier) {
 		if (effects == null) return;
-		
+
 		addActorMaxHealth(actor, effects.increaseMaxHP * multiplier, false);
 		addActorMaxAP(actor, effects.increaseMaxAP * multiplier, false);
-		
+
 		addActorMoveCost(actor, effects.increaseMoveCost * multiplier);
 		addActorAttackCost(actor, effects.increaseAttackCost * multiplier);
 		//criticalMultiplier should not be increased. It is always defined by the weapon in use.
@@ -185,12 +185,12 @@ public final class ActorStatsController {
 		actor.damagePotential.addToMax(effects.increaseMaxDamage * multiplier);
 		actor.blockChance += effects.increaseBlockChance * multiplier;
 		actor.damageResistance += effects.increaseDamageResistance * multiplier;
-		
+
 		if (actor.attackChance < 0) actor.attackChance = 0;
 		if (actor.damagePotential.max < 0) actor.damagePotential.set(0, 0);
 	}
-	
-	public void recalculatePlayerStats(Player player) { 
+
+	public void recalculatePlayerStats(Player player) {
 		player.resetStatsToBaseTraits();
 		player.recalculateLevelExperience();
 		controllers.itemController.applyInventoryEffects(player);
@@ -200,7 +200,7 @@ public final class ActorStatsController {
 		capActorHealthAtMax(player);
 		capActorAPAtMax(player);
 	}
-	public void recalculateMonsterCombatTraits(Monster monster) { 
+	public void recalculateMonsterCombatTraits(Monster monster) {
 		monster.resetStatsToBaseTraits();
 		applyEffectsFromCurrentConditions(monster);
 		capActorHealthAtMax(monster);
@@ -214,7 +214,7 @@ public final class ActorStatsController {
 	public void applyConditionsToPlayer(Player player, boolean isFullRound) {
 		if (player.conditions.isEmpty()) return;
 		if (!isFullRound) removeConditionsFromSkillEffects(player);
-		
+
 		applyStatsEffects(player, isFullRound);
 		if (player.isDead()) {
 			controllers.mapController.handlePlayerDeath();
@@ -251,7 +251,7 @@ public final class ActorStatsController {
 			potentialConditions.add(i);
 		}
 		if (potentialConditions.isEmpty()) return -1;
-		
+
 		return potentialConditions.get(Constants.rnd.nextInt(potentialConditions.size()));
 	}
 
@@ -272,7 +272,7 @@ public final class ActorStatsController {
 			controllers.combatController.playerKilledMonster(monster);
 			return;
 		}
-		
+
 		decreaseDurationAndRemoveConditions(monster);
 	}
 
@@ -291,7 +291,7 @@ public final class ActorStatsController {
 		boolean hasEffect = applyStatsModifierEffect(actor, effect, c.magnitude);
 		if (hasEffect) actorConditionListeners.onActorConditionRoundEffectApplied(actor, c);
 	}
-	
+
 	private void decreaseDurationAndRemoveConditions(Actor actor) {
 		boolean removedAnyConditions = false;
 		for(int i = actor.conditions.size() - 1; i >= 0; --i) {
@@ -310,10 +310,10 @@ public final class ActorStatsController {
 			recalculateActorCombatTraits(actor);
 		}
 	}
-	
+
 	public void applyUseEffect(Actor source, Actor target, ItemTraits_OnUse effect) {
 		if (effect == null) return;
-		
+
 		if (effect.addedConditions_source != null) {
 			for (ActorConditionEffect e : effect.addedConditions_source) {
 				rollForConditionEffect(source, e);
@@ -335,7 +335,7 @@ public final class ActorStatsController {
 	private void rollForConditionEffect(Actor actor, ActorConditionEffect conditionEffect) {
 		int chanceRollBias = 0;
 		if (actor.isPlayer) chanceRollBias = SkillController.getActorConditionEffectChanceRollBias(conditionEffect, (Player) actor);
-		
+
 		if (!Constants.rollResult(conditionEffect.chance, chanceRollBias)) return;
 		applyActorCondition(actor, conditionEffect);
 	}
@@ -374,12 +374,12 @@ public final class ActorStatsController {
 		}
 		return hasUpdatedStats;
 	}
-	
+
 	public void applyKillEffectsToPlayer(Player player) {
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
 			ItemType type = player.inventory.getItemTypeInWearSlot(slot);
 			if (type == null) continue;
-			
+
 			applyUseEffect(player, null, type.effects_kill);
 		}
 	}
@@ -401,42 +401,42 @@ public final class ActorStatsController {
 		,blockChance
 	}
 
-    public void addLevelupEffect(Player player, LevelUpSelection selectionID) {
-    	int hpIncrease = 0;
-    	switch (selectionID) {
-    	case health:
-    		hpIncrease = Constants.LEVELUP_EFFECT_HEALTH;
-    		break;
-    	case attackChance:
-    		player.baseTraits.attackChance += Constants.LEVELUP_EFFECT_ATK_CH;
-    		break;
-    	case attackDamage:
-    		player.baseTraits.damagePotential.max += Constants.LEVELUP_EFFECT_ATK_DMG;
-    		player.baseTraits.damagePotential.current += Constants.LEVELUP_EFFECT_ATK_DMG;
-    		break;
-    	case blockChance:
-    		player.baseTraits.blockChance += Constants.LEVELUP_EFFECT_DEF_CH;
-    		break;
-    	}
-    	if (player.nextLevelAddsNewSkillpoint()) {
-    		player.availableSkillIncreases++;
-    	}
-    	player.level++;
-    	
-    	hpIncrease += player.getSkillLevel(SkillCollection.SkillID.fortitude) * SkillCollection.PER_SKILLPOINT_INCREASE_FORTITUDE_HEALTH;
-    	addActorMaxHealth(player, hpIncrease, true);
+	public void addLevelupEffect(Player player, LevelUpSelection selectionID) {
+		int hpIncrease = 0;
+		switch (selectionID) {
+		case health:
+			hpIncrease = Constants.LEVELUP_EFFECT_HEALTH;
+			break;
+		case attackChance:
+			player.baseTraits.attackChance += Constants.LEVELUP_EFFECT_ATK_CH;
+			break;
+		case attackDamage:
+			player.baseTraits.damagePotential.max += Constants.LEVELUP_EFFECT_ATK_DMG;
+			player.baseTraits.damagePotential.current += Constants.LEVELUP_EFFECT_ATK_DMG;
+			break;
+		case blockChance:
+			player.baseTraits.blockChance += Constants.LEVELUP_EFFECT_DEF_CH;
+			break;
+		}
+		if (player.nextLevelAddsNewSkillpoint()) {
+			player.availableSkillIncreases++;
+		}
+		player.level++;
+
+		hpIncrease += player.getSkillLevel(SkillCollection.SkillID.fortitude) * SkillCollection.PER_SKILLPOINT_INCREASE_FORTITUDE_HEALTH;
+		addActorMaxHealth(player, hpIncrease, true);
 		player.baseTraits.maxHP += hpIncrease;
-		
-    	recalculatePlayerStats(player);
-    }
-	
+
+		recalculatePlayerStats(player);
+	}
+
 	public void healAllMonsters(MonsterSpawnArea area) {
 		for (Monster m : area.monsters) {
 			removeAllTemporaryConditions(m);
 			setActorMaxHealth(m);
 		}
 	}
-	
+
 	public void addExperience(int exp) {
 		if (exp == 0) return;
 		Player p = world.model.player;
@@ -457,15 +457,15 @@ public final class ActorStatsController {
 		actorStatsListeners.onActorAttackCostChanged(actor, actor.attackCost);
 	}
 
-	public void setActorMaxHealth(Actor actor) { 
+	public void setActorMaxHealth(Actor actor) {
 		if (actor.health.isMax()) return;
 		actor.health.setMax();
 		actorStatsListeners.onActorHealthChanged(actor);
 	}
-	public void capActorHealthAtMax(Actor actor) { 
+	public void capActorHealthAtMax(Actor actor) {
 		if (actor.health.capAtMax()) actorStatsListeners.onActorHealthChanged(actor);
 	}
-	public boolean addActorHealth(Actor actor, int amount) { return changeActorHealth(actor, amount, false, false); } 
+	public boolean addActorHealth(Actor actor, int amount) { return changeActorHealth(actor, amount, false, false); }
 	public boolean removeActorHealth(Actor actor, int amount) { return changeActorHealth(actor, -amount, false, false); }
 	public boolean changeActorHealth(Actor actor, int deltaAmount, boolean mayUnderflow, boolean mayOverflow) {
 		final boolean changed = actor.health.change(deltaAmount, mayUnderflow, mayOverflow);
@@ -478,13 +478,13 @@ public final class ActorStatsController {
 		if (affectCurrentHealth) actor.health.add(amount, false);
 		actorStatsListeners.onActorHealthChanged(actor);
 	}
-	
-	public void setActorMaxAP(Actor actor) { 
+
+	public void setActorMaxAP(Actor actor) {
 		if (actor.ap.isMax()) return;
 		actor.ap.setMax();
 		actorStatsListeners.onActorAPChanged(actor);
 	}
-	public void capActorAPAtMax(Actor actor) { 
+	public void capActorAPAtMax(Actor actor) {
 		if (actor.ap.capAtMax()) actorStatsListeners.onActorAPChanged(actor);
 	}
 	public boolean addActorAP(Actor actor, int amount) { return changeActorAP(actor, amount, false, false); }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index e02fa3619..4b6b9d0e6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@ -26,39 +26,39 @@ import java.util.ArrayList;
 
 public final class CombatController implements VisualEffectCompletedCallback {
 	private final ControllerContext controllers;
-    private final WorldContext world;
-    public final CombatSelectionListeners combatSelectionListeners = new CombatSelectionListeners(); 
-    public final CombatActionListeners combatActionListeners = new CombatActionListeners();
-    public final CombatTurnListeners combatTurnListeners = new CombatTurnListeners();
-    
+	private final WorldContext world;
+	public final CombatSelectionListeners combatSelectionListeners = new CombatSelectionListeners();
+	public final CombatActionListeners combatActionListeners = new CombatActionListeners();
+	public final CombatTurnListeners combatTurnListeners = new CombatTurnListeners();
+
 	private Monster currentActiveMonster = null;
-    private final ArrayList<Loot> killedMonsterBags = new ArrayList<Loot>();
-    private int totalExpThisFight = 0;
-    
+	private final ArrayList<Loot> killedMonsterBags = new ArrayList<Loot>();
+	private int totalExpThisFight = 0;
+
 	public CombatController(ControllerContext controllers, WorldContext world) {
-    	this.controllers = controllers;
-    	this.world = world;
-    }
+		this.controllers = controllers;
+		this.world = world;
+	}
 
 	public static final int BEGIN_TURN_PLAYER = 0;
 	public static final int BEGIN_TURN_MONSTERS = 1;
 	public static final int BEGIN_TURN_CONTINUE = 2;
-	
+
 	public void enterCombat(int beginTurnAs) {
-    	world.model.uiSelections.isInCombat = true;
-    	killedMonsterBags.clear();
-    	combatTurnListeners.onCombatStarted();
-    	if (beginTurnAs == BEGIN_TURN_PLAYER) newPlayerTurn(true);
-    	else if (beginTurnAs == BEGIN_TURN_MONSTERS) beginMonsterTurn(true);
-    	else continueTurn();
-    }
-    public void exitCombat(boolean pickupLootBags) {
-    	setCombatSelection(null, null);
-    	world.model.uiSelections.isInCombat = false;
+		world.model.uiSelections.isInCombat = true;
+		killedMonsterBags.clear();
+		combatTurnListeners.onCombatStarted();
+		if (beginTurnAs == BEGIN_TURN_PLAYER) newPlayerTurn(true);
+		else if (beginTurnAs == BEGIN_TURN_MONSTERS) beginMonsterTurn(true);
+		else continueTurn();
+	}
+	public void exitCombat(boolean pickupLootBags) {
+		setCombatSelection(null, null);
+		world.model.uiSelections.isInCombat = false;
 		combatTurnListeners.onCombatEnded();
-    	currentActiveMonster = null;
-    	world.model.uiSelections.selectedPosition = null;
-    	world.model.uiSelections.selectedMonster = null;
+		currentActiveMonster = null;
+		world.model.uiSelections.selectedPosition = null;
+		world.model.uiSelections.selectedMonster = null;
 		controllers.gameRoundController.resetRoundTimers();
 		if (pickupLootBags && totalExpThisFight > 0) {
 			controllers.itemController.lootMonsterBags(killedMonsterBags, totalExpThisFight);
@@ -66,10 +66,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
 			controllers.gameRoundController.resume();
 		}
 		killedMonsterBags.clear();
-    	totalExpThisFight = 0;
-    }
-    
-	public boolean isMonsterTurn() { 
+		totalExpThisFight = 0;
+	}
+
+	public boolean isMonsterTurn() {
 		return currentActiveMonster != null;
 	}
 
@@ -84,7 +84,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		Coord previousSelection = world.model.uiSelections.selectedPosition;
 		if (previousSelection != null) {
 			world.model.uiSelections.selectedPosition = null;
-			if (selectedPosition == null || !selectedPosition.equals(previousSelection)) {	
+			if (selectedPosition == null || !selectedPosition.equals(previousSelection)) {
 			} else {
 				previousSelection = null;
 			}
@@ -96,12 +96,12 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		} else {
 			world.model.uiSelections.selectedPosition = null;
 		}
-		
+
 		if (selectedMonster != null) combatSelectionListeners.onMonsterSelected(selectedMonster, selectedPosition, previousSelection);
 		else if (selectedPosition != null) combatSelectionListeners.onMovementDestinationSelected(selectedPosition, previousSelection);
 		else if (previousSelection != null) combatSelectionListeners.onCombatSelectionCleared(previousSelection);
 	}
-	
+
 	public void setCombatSelection(Coord p) {
 		Monster m = world.model.currentMap.getMonsterAt(p);
 		if (m != null) {
@@ -119,10 +119,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
 			return false;
 		}
 	}
-	
+
 	public boolean canExitCombat() { return getAdjacentAggressiveMonster() == null; }
 	private Monster getAdjacentAggressiveMonster() {
-		return MovementController.getAdjacentAggressiveMonster(world.model.currentMap, world.model.player); 
+		return MovementController.getAdjacentAggressiveMonster(world.model.currentMap, world.model.player);
 	}
 
 	public void executeMoveAttack(int dx, int dy) {
@@ -145,7 +145,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 			executePlayerAttack();
 		}
 	}
-	
+
 	private void executeFlee(int dx, int dy) {
 		// avoid monster fields when fleeing
 		if (!controllers.movementController.findWalkablePosition(dx, dy, AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_DEFENSIVE)) return;
@@ -163,21 +163,21 @@ public final class CombatController implements VisualEffectCompletedCallback {
 
 		final AttackResult attack = playerAttacks(target);
 		this.lastAttackResult = attack;
-		
+
 		if (attack.isHit) {
 			combatActionListeners.onPlayerAttackSuccess(target, attack);
-			
+
 			if (attack.targetDied) {
 				playerKilledMonster(target);
 			}
-			
+
 			startAttackEffect(attack, attackPosition, this, CALLBACK_PLAYERATTACK);
 		} else {
 			combatActionListeners.onPlayerAttackMissed(target, attack);
 			playerAttackCompleted();
 		}
 	}
-	
+
 	private void playerAttackCompleted() {
 		if (world.model.uiSelections.selectedMonster == null) {
 			selectNextAggressiveMonster();
@@ -185,38 +185,38 @@ public final class CombatController implements VisualEffectCompletedCallback {
 
 		playerActionCompleted();
 	}
-	
-    public void playerKilledMonster(Monster killedMonster) {
-    	final Player player = world.model.player;
-    	
-    	Loot loot = world.model.currentMap.getBagOrCreateAt(killedMonster.position);
+
+	public void playerKilledMonster(Monster killedMonster) {
+		final Player player = world.model.player;
+
+		Loot loot = world.model.currentMap.getBagOrCreateAt(killedMonster.position);
 		killedMonster.createLoot(loot, player);
-		
+
 		controllers.monsterSpawnController.remove(world.model.currentMap, killedMonster);
 		controllers.effectController.addSplatter(world.model.currentMap, killedMonster);
-		
+
 		controllers.actorStatsController.addActorAP(player, player.getSkillLevel(SkillCollection.SkillID.cleave) * SkillCollection.PER_SKILLPOINT_INCREASE_CLEAVE_AP);
 		controllers.actorStatsController.addActorHealth(player, player.getSkillLevel(SkillCollection.SkillID.eater) * SkillCollection.PER_SKILLPOINT_INCREASE_EATER_HEALTH);
-		
+
 		world.model.statistics.addMonsterKill(killedMonster.getMonsterTypeID());
 		controllers.actorStatsController.addExperience(loot.exp);
-		
+
 		totalExpThisFight += loot.exp;
 		loot.exp = 0;
 		controllers.actorStatsController.applyKillEffectsToPlayer(player);
-		
+
 		if (!loot.hasItemsOrGold()) {
 			world.model.currentMap.removeGroundLoot(loot);
 		} else if (world.model.uiSelections.isInCombat) {
 			killedMonsterBags.add(loot);
 		}
-		
+
 		combatActionListeners.onPlayerKilledMonster(killedMonster);
 
 		if (world.model.uiSelections.selectedMonster == killedMonster) {
 			selectNextAggressiveMonster();
 		}
-    }
+	}
 
 	private boolean selectNextAggressiveMonster() {
 		Monster nextMonster = getAdjacentAggressiveMonster();
@@ -259,10 +259,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
 			fleeingFailed();
 			return;
 		}
-		
+
 		world.model.player.nextPosition.set(dest);
 		controllers.movementController.moveToNextIfPossible(false);
-		
+
 		playerActionCompleted();
 	}
 
@@ -270,22 +270,22 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		combatActionListeners.onPlayerFailedFleeing();
 		beginMonsterTurn(false);
 	}
-	
+
 	private final Handler monsterTurnHandler = new Handler() {
 		@Override
-        public void handleMessage(Message msg) {
-        	removeMessages(0);
-            CombatController.this.handleNextMonsterAction();
-        }
+		public void handleMessage(Message msg) {
+			removeMessages(0);
+			CombatController.this.handleNextMonsterAction();
+		}
 	};
-    private void waitForNextMonsterAction() {
-        if (controllers.preferences.attackspeed_milliseconds <= 0) {
-            handleNextMonsterAction();
-        } else {
-            monsterTurnHandler.sendEmptyMessageDelayed(0, controllers.preferences.attackspeed_milliseconds);
-        }
-    }
-	
+	private void waitForNextMonsterAction() {
+		if (controllers.preferences.attackspeed_milliseconds <= 0) {
+			handleNextMonsterAction();
+		} else {
+			monsterTurnHandler.sendEmptyMessageDelayed(0, controllers.preferences.attackspeed_milliseconds);
+		}
+	}
+
 	public void beginMonsterTurn(boolean isFirstRound) {
 		controllers.actorStatsController.setActorMinAP(world.model.player);
 		world.model.uiSelections.isPlayersCombatTurn = false;
@@ -298,7 +298,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		if (!isFirstRound) controllers.gameRoundController.onNewMonsterRound();
 		handleNextMonsterAction();
 	}
-	
+
 	private static final int ACTION_NONE = 0;
 	private static final int ACTION_ATTACK = 1;
 	private static final int ACTION_MOVE = 2;
@@ -306,11 +306,11 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		if (currentActiveMonster != null) {
 			if (shouldAttackWithMonsterInCombat(currentActiveMonster, playerPosition)) return ACTION_ATTACK;
 		}
-		
+
 		for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) {
 			for (Monster m : a.monsters) {
 				if (!m.isAgressive()) continue;
-				
+
 				if (shouldAttackWithMonsterInCombat(m, playerPosition)) {
 					currentActiveMonster = m;
 					return ACTION_ATTACK;
@@ -322,7 +322,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		}
 		return ACTION_NONE;
 	}
-	
+
 	private static boolean shouldAttackWithMonsterInCombat(Monster m, Coord playerPosition) {
 		if (!m.hasAPs(m.getAttackCost())) return false;
 		if (!m.rectPosition.isAdjacentTo(playerPosition)) return false;
@@ -331,10 +331,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	private static boolean shouldMoveMonsterInCombat(Monster m, MonsterSpawnArea a, Coord playerPosition) {
 		final MonsterType.AggressionType movementAggressionType = m.getMovementAggressionType();
 		if (movementAggressionType == MonsterType.AggressionType.none) return false;
-		
+
 		if (!m.hasAPs(m.getMoveCost())) return false;
 		if (m.position.isAdjacentTo(playerPosition)) return false;
-		
+
 		if (movementAggressionType == MonsterType.AggressionType.protectSpawn) {
 			if (a.area.contains(playerPosition)) return true;
 		} else if (movementAggressionType == MonsterType.AggressionType.helpOthers) {
@@ -345,10 +345,10 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		}
 		return false;
 	}
-	
+
 	private void handleNextMonsterAction() {
 		if (!world.model.uiSelections.isMainActivityVisible) return;
-		
+
 		int nextMonsterAction = determineNextMonsterAction(world.model.player.position);
 		if (nextMonsterAction == ACTION_NONE) {
 			endMonsterTurn();
@@ -358,7 +358,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 			moveCurrentMonster();
 		}
 	}
-	
+
 	private void moveCurrentMonster() {
 		controllers.actorStatsController.useAPs(currentActiveMonster, currentActiveMonster.getMoveCost());
 		if (!controllers.monsterMovementController.findPathFor(currentActiveMonster, world.model.player.position)) {
@@ -368,31 +368,31 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		}
 
 		controllers.monsterMovementController.moveMonsterToNextPosition(currentActiveMonster, world.model.currentMap);
-        combatActionListeners.onMonsterMovedDuringCombat(currentActiveMonster);
+		combatActionListeners.onMonsterMovedDuringCombat(currentActiveMonster);
 		waitForNextMonsterAction();
 	}
-	
+
 	private void attackWithCurrentMonster() {
 		controllers.actorStatsController.useAPs(currentActiveMonster, currentActiveMonster.getAttackCost());
 
-        combatTurnListeners.onMonsterIsAttacking(currentActiveMonster);
+		combatTurnListeners.onMonsterIsAttacking(currentActiveMonster);
 		AttackResult attack = monsterAttacks(currentActiveMonster);
 		this.lastAttackResult = attack;
-		
+
 		if (attack.isHit) {
 			combatActionListeners.onMonsterAttackSuccess(currentActiveMonster, attack);
-			
+
 			startAttackEffect(attack, world.model.player.position, this, CALLBACK_MONSTERATTACK);
 		} else {
 			combatActionListeners.onMonsterAttackMissed(currentActiveMonster, attack);
 
-            waitForNextMonsterAction();
+			waitForNextMonsterAction();
 		}
 	}
 
 	private static final int CALLBACK_MONSTERATTACK = 0;
 	private static final int CALLBACK_PLAYERATTACK = 1;
-	
+
 	@Override
 	public void onVisualEffectCompleted(int callbackValue) {
 		if (!world.model.uiSelections.isInCombat) return;
@@ -410,7 +410,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		}
 		handleNextMonsterAction();
 	}
-	
+
 	private void startAttackEffect(AttackResult attack, final Coord position, VisualEffectCompletedCallback callback, int callbackValue) {
 		if (controllers.preferences.attackspeed_milliseconds <= 0) {
 			callback.onVisualEffectCompleted(callbackValue);
@@ -427,7 +427,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		currentActiveMonster = null;
 		newPlayerTurn(false);
 	}
-	
+
 	private void newPlayerTurn(boolean isFirstRound) {
 		if (canExitCombat()) {
 			exitCombat(true);
@@ -438,7 +438,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		world.model.uiSelections.isPlayersCombatTurn = true;
 		combatTurnListeners.onNewPlayerTurn();
 	}
-	
+
 	private static boolean hasCriticalAttack(Actor attacker, Actor target) {
 		if (!attacker.hasCriticalAttacks()) return false;
 		if (target.isImmuneToCriticalHits()) return false;
@@ -461,7 +461,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		} else {
 			if (attacker.getDamagePotential().max <= target.getDamageResistance()) return 999;
 		}
-		
+
 		float averageDamagePerTurn = getAverageDamagePerTurn(attacker, target);
 		if (averageDamagePerTurn <= 0) return 100;
 		return (int) FloatMath.ceil(target.getMaxHP() / averageDamagePerTurn);
@@ -476,19 +476,19 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		if (result > 100) return 100;
 		return result;
 	}
-	
+
 	private AttackResult playerAttacks(Monster currentMonster) {
-    	AttackResult result = attack(world.model.player, currentMonster);
-    	controllers.skillController.applySkillEffectsFromPlayerAttack(result, currentMonster);
-    	return result;
+		AttackResult result = attack(world.model.player, currentMonster);
+		controllers.skillController.applySkillEffectsFromPlayerAttack(result, currentMonster);
+		return result;
 	}
-	
+
 	private AttackResult monsterAttacks(Monster currentMonster) {
 		AttackResult result = attack(currentMonster, world.model.player);
 		controllers.skillController.applySkillEffectsFromMonsterAttack(result, currentMonster);
 		return result;
 	}
-	
+
 
 	private static final int n = 50;
 	private static final int F = 40;
@@ -498,11 +498,11 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		// (2/pi)*atan(..) will vary from -1 to +1 .
 		return (int) (50 * (1 + two_divided_by_PI * (float)Math.atan((float)(c-n) / F)));
 	}
-	
+
 	private AttackResult attack(final Actor attacker, final Actor target) {
 		int hitChance = getAttackHitChance(attacker, target);
 		if (!Constants.roll100(hitChance)) return AttackResult.MISS;
-		
+
 		int damage = Constants.rollValue(attacker.getDamagePotential());
 		boolean isCriticalHit = false;
 		if (hasCriticalAttack(attacker, target)) {
@@ -514,7 +514,7 @@ public final class CombatController implements VisualEffectCompletedCallback {
 		damage -= target.getDamageResistance();
 		if (damage < 0) damage = 0;
 		controllers.actorStatsController.removeActorHealth(target, damage);
-		
+
 		applyAttackHitStatusEffects(attacker, target);
 
 		return new AttackResult(true, isCriticalHit, damage, target.isDead());
@@ -523,17 +523,17 @@ public final class CombatController implements VisualEffectCompletedCallback {
 	private void applyAttackHitStatusEffects(Actor attacker, Actor target) {
 		ItemTraits_OnUse[] onHitEffects = attacker.getOnHitEffects();
 		if (onHitEffects == null) return;
-		
+
 		for (ItemTraits_OnUse e : onHitEffects) {
 			controllers.actorStatsController.applyUseEffect(attacker, target, e);
 		}
 	}
-	
+
 	public void monsterSteppedOnPlayer(Monster m) {
 		setCombatSelection(m);
 		enterCombat(BEGIN_TURN_MONSTERS);
 	}
-	
+
 	public void startFlee() {
 		setCombatSelection(null, null);
 		combatActionListeners.onPlayerStartedFleeing();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
index 3f13a3903..1893d5d0a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/Constants.java
@@ -25,17 +25,17 @@ public final class Constants {
 
 	public static final int MONSTER_MOVEMENT_TURN_DURATION_MS = 1200;
 	public static final int ATTACK_ANIMATION_FPS = 10;
-	
+
 	public static final int TICK_DELAY = 500;
 	private static final int ROUND_DURATION = 6000;
 	private static final int FULLROUND_DURATION = 25000;
 	public static final int TICKS_PER_ROUND = ROUND_DURATION / TICK_DELAY;
 	public static final int TICKS_PER_FULLROUND = FULLROUND_DURATION / TICK_DELAY;
 	public static final int SPLATTER_DURATION_MS = 20000;
-	
+
 	public static final ConstRange monsterWaitTurns = new ConstRange(30,4);
 	public static final long MAP_UNVISITED_RESPAWN_DURATION_MS = 3 * 60 * 1000; // 3 min in milliseconds
-	
+
 	public static final String PREFERENCE_MODEL_LASTRUNVERSION = "lastversion";
 	public static final String FILENAME_SAVEGAME_QUICKSAVE = "savegame";
 	public static final String FILENAME_SAVEGAME_DIRECTORY = "andors-trail";
@@ -44,12 +44,12 @@ public final class Constants {
 	public static final String FILENAME_WORLDMAP_HTMLFILE_SUFFIX = ".html";
 	public static final String FILENAME_SAVEGAME_FILENAME_PREFIX = "savegame";
 	public static final String PLACEHOLDER_PLAYERNAME = "$playername";
-	
+
 	public static final Random rnd = new Random();
 	public static int rollValue(final ConstRange r) { return rollValue(r.max, r.current); }
 	public static int rollValue(final ConstRange r, int bias) { return rollValue(r.max, r.current + bias); }
 	public static int rollValue(final Range r) { return rollValue(r.max, r.current); }
-	private static int rollValue(final int max, final int min) { 
+	private static int rollValue(final int max, final int min) {
 		if (max <= min) return max;
 		else return rnd.nextInt(max - min + 1) + min;
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index ce27910d6..b5d0c653f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -1,297 +1,297 @@
-package com.gpl.rpg.AndorsTrail.controller;
-
-import android.content.res.Resources;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.conversation.ConversationCollection;
-import com.gpl.rpg.AndorsTrail.conversation.Phrase;
-import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reply;
-import com.gpl.rpg.AndorsTrail.conversation.Phrase.Requirement;
-import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reward;
-import com.gpl.rpg.AndorsTrail.model.ability.*;
-import com.gpl.rpg.AndorsTrail.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
-import com.gpl.rpg.AndorsTrail.model.item.Loot;
-import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
-import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail.util.ConstRange;
-
-import java.util.ArrayList;
-
-public final class ConversationController {
-
-	private final ControllerContext controllers;
-	private final WorldContext world;
-
-	public ConversationController(ControllerContext controllers, WorldContext world) {
-		this.controllers = controllers;
-		this.world = world;
-	}
-	
-	private static final ConstRange always = new ConstRange(1, 1);
-
-	public static final class PhraseRewards {
-		public final Loot loot = new Loot();
-		public final ArrayList<ActorConditionEffect> actorConditions = new ArrayList<ActorConditionEffect>();
-		public final ArrayList<SkillInfo> skillIncrease = new ArrayList<SkillInfo>();
-		public final ArrayList<QuestProgress> questProgress = new ArrayList<QuestProgress>();
-
-        public boolean isEmpty() {
-            if (loot.hasItemsOrExp()) return false;
-            if (!actorConditions.isEmpty()) return false;
-            if (!skillIncrease.isEmpty()) return false;
-            if (!questProgress.isEmpty()) return false;
-            return true;
-        }
-    }
-
-	private PhraseRewards applyPhraseRewards(final Player player, final Phrase phrase) {
-		if (phrase.rewards == null || phrase.rewards.length == 0) return null;
-		
-		final PhraseRewards result = new PhraseRewards();
-		for (Reward reward : phrase.rewards) {
-			switch (reward.rewardType) {
-			case actorCondition:
-				addActorConditionReward(player, reward.rewardID, reward.value, result);
-				break;
-			case skillIncrease:
-				addSkillReward(player, SkillCollection.SkillID.valueOf(reward.rewardID), result);
-				break;
-			case dropList:
-				addDropListReward(player, reward.rewardID, result);
-				break;
-			case questProgress:
-				addQuestProgressReward(player, reward.rewardID, reward.value, result);
-				break;
-			case alignmentChange:
-				player.addAlignment(reward.rewardID, reward.value);
-				break;
-			}
-		}
-
-        if (result.isEmpty()) return null;
-
-		player.inventory.add(result.loot);
-		controllers.actorStatsController.addExperience(result.loot.exp);
-
-		return result;
-	}
-
-	private void addQuestProgressReward(Player player, String questID, int questProgress, PhraseRewards result) {
-		QuestProgress progress = new QuestProgress(questID, questProgress);
-		boolean added = player.addQuestProgress(progress);
-		if (!added) return; // Only apply exp reward if the quest stage was reached just now (and not re-reached)
-
-		QuestLogEntry stage = world.quests.getQuestLogEntry(progress);
-		if (stage != null) {
-			result.loot.exp += stage.rewardExperience;
-			result.questProgress.add(progress);
-		}
-	}
-
-	private void addDropListReward(Player player, String droplistID, PhraseRewards result) {
-		world.dropLists.getDropList(droplistID).createRandomLoot(result.loot, player);
-	}
-
-	private void addSkillReward(Player player, SkillCollection.SkillID skillID, PhraseRewards result) {
-		SkillInfo skill = world.skills.getSkill(skillID);
-		boolean addedSkill = controllers.skillController.levelUpSkillByQuest(player, skill);
-		if (addedSkill) {
-			result.skillIncrease.add(skill);
-		}
-	}
-
-	private void addActorConditionReward(Player player, String conditionTypeID, int value, PhraseRewards result) {
-		int magnitude = 1;
-		int duration = value;
-		if (value == ActorCondition.DURATION_FOREVER) duration = ActorCondition.DURATION_FOREVER;
-		else if (value == ActorCondition.MAGNITUDE_REMOVE_ALL) magnitude = ActorCondition.MAGNITUDE_REMOVE_ALL;
-
-		ActorConditionType conditionType = world.actorConditionsTypes.getActorConditionType(conditionTypeID);
-		ActorConditionEffect e = new ActorConditionEffect(conditionType, magnitude, duration, always);
-		controllers.actorStatsController.applyActorCondition(player, e);
-		result.actorConditions.add(e);
-	}
-
-	private static void applyReplyEffect(final Player player, final Reply reply) {
-		if (!reply.hasRequirements()) return;
-
-		for (Requirement requirement : reply.requires) {
-			if (requirement.requireType == Requirement.RequirementType.inventoryRemove) {
-				if (ItemTypeCollection.isGoldItemType(requirement.requireID)) {
-					player.inventory.gold -= requirement.value;
-				} else {
-					player.inventory.removeItem(requirement.requireID, requirement.value);
-				}
-			}
-		}
-	}
-
-	private static boolean canSelectReply(final WorldContext world, final Reply reply) {
-		if (!reply.hasRequirements()) return true;
-
-		for (Requirement requirement : reply.requires) {
-			if (!playerSatisfiesRequirement(world, requirement)) return false;
-		}
-		return true;
-    }
-	
-	private static boolean playerSatisfiesRequirement(final WorldContext world, final Requirement requirement) {
-		Player player = world.model.player;
-		switch (requirement.requireType) {
-			case questProgress:
-				return player.hasExactQuestProgress(requirement.requireID, requirement.value);
-			case wear:
-				return player.inventory.isWearing(requirement.requireID);
-			case inventoryKeep:
-			case inventoryRemove:
-				if (ItemTypeCollection.isGoldItemType(requirement.requireID)) {
-					return player.inventory.gold >= requirement.value;
-				} else {
-					return player.inventory.hasItem(requirement.requireID, requirement.value);
-				}
-			case skillLevel:
-				return player.getSkillLevel(SkillCollection.SkillID.valueOf(requirement.requireID)) >= requirement.value;
-			case killedMonster:
-				return world.model.statistics.getNumberOfKillsForMonsterType(requirement.requireID) >= requirement.value;
-			default:
-				return true;
-		}
-    }
-	
-	private static String getDisplayMessage(Phrase phrase, Player player) { return replacePlayerName(phrase.message, player); }
-	private static String getDisplayMessage(Reply reply, Player player) { return replacePlayerName(reply.text, player); }
-    private static String replacePlayerName(String s, Player player) {
-		return s.replace(Constants.PLACEHOLDER_PLAYERNAME, player.getName());
-	}
-
-	public static final class ConversationStatemachine {
-		private final ConversationCollection conversationCollection = new ConversationCollection();
-		private final WorldContext world;
-		private final ControllerContext controllers;
-		private final Player player;
-		private final Resources res;
-		private String phraseID;
-		private Phrase currentPhrase;
-		private Monster npc;
-		public ConversationStateListener listener;
-
-		public ConversationStatemachine(WorldContext world, ControllerContext controllers, Resources res, ConversationStateListener listener) {
-			this.world = world;
-			this.player = world.model.player;
-			this.controllers = controllers;
-			this.res = res;
-			this.listener = listener;
-		}
-
-		public void setCurrentNPC(Monster currentNPC) { this.npc = currentNPC; }
-		public Monster getCurrentNPC() { return npc; }
-		public String getCurrentPhraseID() { return phraseID; }
-
-		public void playerSelectedReply(Reply r) {
-			applyReplyEffect(player, r);
-			proceedToPhrase(r.nextPhrase);
-		}
-
-		public void playerSelectedNextStep() {
-			playerSelectedReply(currentPhrase.replies[0]);
-		}
-
-		public interface ConversationStateListener {
-			void onTextPhraseReached(String message, Actor actor);
-			void onConversationEnded();
-			void onConversationEndedWithShop(Monster npc);
-			void onConversationEndedWithCombat(Monster npc);
-			void onConversationEndedWithRemoval(Monster npc);
-			void onPlayerReceivedRewards(ConversationController.PhraseRewards phraseRewards);
-			void onConversationCanProceedWithNext();
-			void onConversationHasReply(Reply r, String message);
-		}
-
-		private void setCurrentPhrase(String phraseID) {
-			this.phraseID = phraseID;
-			this.currentPhrase = world.conversationLoader.loadPhrase(phraseID, conversationCollection, res);
-			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
-				if (currentPhrase == null) currentPhrase = new Phrase("(phrase \"" + phraseID + "\" not implemented yet)", null, null);
-			}
-		}
-
-		public void proceedToPhrase(String phraseID) {
-			if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_CLOSE)) {
-				listener.onConversationEnded();
-				return;
-			} else if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_SHOP)) {
-				listener.onConversationEndedWithShop(npc);
-				return;
-			} else if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_ATTACK)) {
-                endConversationWithCombat();
-				return;
-			} else if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_REMOVE)) {
-                endConversationWithRemovingNPC();
-				return;
-			}
-
-			setCurrentPhrase(phraseID);
-
-			ConversationController.PhraseRewards phraseRewards = controllers.conversationController.applyPhraseRewards(player, currentPhrase);
-			if (phraseRewards != null) {
-				listener.onPlayerReceivedRewards(phraseRewards);
-			}
-
-			if (currentPhrase.message == null) {
-				for (Reply r : currentPhrase.replies) {
-					if (!canSelectReply(world, r)) continue;
-					applyReplyEffect(player, r);
-					proceedToPhrase(r.nextPhrase);
-					return;
-				}
-			}
-
-			String message = getDisplayMessage(currentPhrase, player);
-			listener.onTextPhraseReached(message, npc);
-
-			requestReplies();
-		}
-
-        private void endConversationWithRemovingNPC() {
-            controllers.monsterSpawnController.remove(world.model.currentMap, npc);
-            listener.onConversationEndedWithRemoval(npc);
-        }
-
-        private void endConversationWithCombat() {
-            npc.forceAggressive();
-            controllers.combatController.setCombatSelection(npc);
-            controllers.combatController.enterCombat(CombatController.BEGIN_TURN_PLAYER);
-            listener.onConversationEndedWithCombat(npc);
-        }
-
-        private void requestReplies() {
-			if (hasOnlyOneNextReply()) {
-				listener.onConversationCanProceedWithNext();
-				return;
-			}
-
-			for (Reply r : currentPhrase.replies) {
-				if (!canSelectReply(world, r)) continue;
-				listener.onConversationHasReply(r, getDisplayMessage(r, player));
-			}
-		}
-
-		public void proceedToRestoredState(String phraseID) {
-			setCurrentPhrase(phraseID);
-			requestReplies();
-		}
-
-		public boolean hasOnlyOneNextReply() {
-			if (currentPhrase.replies == null) return false;
-			if (currentPhrase.replies.length != 1) return false;
-			final Reply singleReply = currentPhrase.replies[0];
-			if (!singleReply.text.equals(ConversationCollection.REPLY_NEXT)) return false;
-			if (!canSelectReply(world, singleReply)) return false;
-			return true;
-		}
-	}
-}
+package com.gpl.rpg.AndorsTrail.controller;
+
+import android.content.res.Resources;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.conversation.ConversationCollection;
+import com.gpl.rpg.AndorsTrail.conversation.Phrase;
+import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reply;
+import com.gpl.rpg.AndorsTrail.conversation.Phrase.Requirement;
+import com.gpl.rpg.AndorsTrail.conversation.Phrase.Reward;
+import com.gpl.rpg.AndorsTrail.model.ability.*;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+
+import java.util.ArrayList;
+
+public final class ConversationController {
+
+	private final ControllerContext controllers;
+	private final WorldContext world;
+
+	public ConversationController(ControllerContext controllers, WorldContext world) {
+		this.controllers = controllers;
+		this.world = world;
+	}
+
+	private static final ConstRange always = new ConstRange(1, 1);
+
+	public static final class PhraseRewards {
+		public final Loot loot = new Loot();
+		public final ArrayList<ActorConditionEffect> actorConditions = new ArrayList<ActorConditionEffect>();
+		public final ArrayList<SkillInfo> skillIncrease = new ArrayList<SkillInfo>();
+		public final ArrayList<QuestProgress> questProgress = new ArrayList<QuestProgress>();
+
+		public boolean isEmpty() {
+			if (loot.hasItemsOrExp()) return false;
+			if (!actorConditions.isEmpty()) return false;
+			if (!skillIncrease.isEmpty()) return false;
+			if (!questProgress.isEmpty()) return false;
+			return true;
+		}
+	}
+
+	private PhraseRewards applyPhraseRewards(final Player player, final Phrase phrase) {
+		if (phrase.rewards == null || phrase.rewards.length == 0) return null;
+
+		final PhraseRewards result = new PhraseRewards();
+		for (Reward reward : phrase.rewards) {
+			switch (reward.rewardType) {
+			case actorCondition:
+				addActorConditionReward(player, reward.rewardID, reward.value, result);
+				break;
+			case skillIncrease:
+				addSkillReward(player, SkillCollection.SkillID.valueOf(reward.rewardID), result);
+				break;
+			case dropList:
+				addDropListReward(player, reward.rewardID, result);
+				break;
+			case questProgress:
+				addQuestProgressReward(player, reward.rewardID, reward.value, result);
+				break;
+			case alignmentChange:
+				player.addAlignment(reward.rewardID, reward.value);
+				break;
+			}
+		}
+
+		if (result.isEmpty()) return null;
+
+		player.inventory.add(result.loot);
+		controllers.actorStatsController.addExperience(result.loot.exp);
+
+		return result;
+	}
+
+	private void addQuestProgressReward(Player player, String questID, int questProgress, PhraseRewards result) {
+		QuestProgress progress = new QuestProgress(questID, questProgress);
+		boolean added = player.addQuestProgress(progress);
+		if (!added) return; // Only apply exp reward if the quest stage was reached just now (and not re-reached)
+
+		QuestLogEntry stage = world.quests.getQuestLogEntry(progress);
+		if (stage != null) {
+			result.loot.exp += stage.rewardExperience;
+			result.questProgress.add(progress);
+		}
+	}
+
+	private void addDropListReward(Player player, String droplistID, PhraseRewards result) {
+		world.dropLists.getDropList(droplistID).createRandomLoot(result.loot, player);
+	}
+
+	private void addSkillReward(Player player, SkillCollection.SkillID skillID, PhraseRewards result) {
+		SkillInfo skill = world.skills.getSkill(skillID);
+		boolean addedSkill = controllers.skillController.levelUpSkillByQuest(player, skill);
+		if (addedSkill) {
+			result.skillIncrease.add(skill);
+		}
+	}
+
+	private void addActorConditionReward(Player player, String conditionTypeID, int value, PhraseRewards result) {
+		int magnitude = 1;
+		int duration = value;
+		if (value == ActorCondition.DURATION_FOREVER) duration = ActorCondition.DURATION_FOREVER;
+		else if (value == ActorCondition.MAGNITUDE_REMOVE_ALL) magnitude = ActorCondition.MAGNITUDE_REMOVE_ALL;
+
+		ActorConditionType conditionType = world.actorConditionsTypes.getActorConditionType(conditionTypeID);
+		ActorConditionEffect e = new ActorConditionEffect(conditionType, magnitude, duration, always);
+		controllers.actorStatsController.applyActorCondition(player, e);
+		result.actorConditions.add(e);
+	}
+
+	private static void applyReplyEffect(final Player player, final Reply reply) {
+		if (!reply.hasRequirements()) return;
+
+		for (Requirement requirement : reply.requires) {
+			if (requirement.requireType == Requirement.RequirementType.inventoryRemove) {
+				if (ItemTypeCollection.isGoldItemType(requirement.requireID)) {
+					player.inventory.gold -= requirement.value;
+				} else {
+					player.inventory.removeItem(requirement.requireID, requirement.value);
+				}
+			}
+		}
+	}
+
+	private static boolean canSelectReply(final WorldContext world, final Reply reply) {
+		if (!reply.hasRequirements()) return true;
+
+		for (Requirement requirement : reply.requires) {
+			if (!playerSatisfiesRequirement(world, requirement)) return false;
+		}
+		return true;
+	}
+
+	private static boolean playerSatisfiesRequirement(final WorldContext world, final Requirement requirement) {
+		Player player = world.model.player;
+		switch (requirement.requireType) {
+			case questProgress:
+				return player.hasExactQuestProgress(requirement.requireID, requirement.value);
+			case wear:
+				return player.inventory.isWearing(requirement.requireID);
+			case inventoryKeep:
+			case inventoryRemove:
+				if (ItemTypeCollection.isGoldItemType(requirement.requireID)) {
+					return player.inventory.gold >= requirement.value;
+				} else {
+					return player.inventory.hasItem(requirement.requireID, requirement.value);
+				}
+			case skillLevel:
+				return player.getSkillLevel(SkillCollection.SkillID.valueOf(requirement.requireID)) >= requirement.value;
+			case killedMonster:
+				return world.model.statistics.getNumberOfKillsForMonsterType(requirement.requireID) >= requirement.value;
+			default:
+				return true;
+		}
+	}
+
+	private static String getDisplayMessage(Phrase phrase, Player player) { return replacePlayerName(phrase.message, player); }
+	private static String getDisplayMessage(Reply reply, Player player) { return replacePlayerName(reply.text, player); }
+	private static String replacePlayerName(String s, Player player) {
+		return s.replace(Constants.PLACEHOLDER_PLAYERNAME, player.getName());
+	}
+
+	public static final class ConversationStatemachine {
+		private final ConversationCollection conversationCollection = new ConversationCollection();
+		private final WorldContext world;
+		private final ControllerContext controllers;
+		private final Player player;
+		private final Resources res;
+		private String phraseID;
+		private Phrase currentPhrase;
+		private Monster npc;
+		public ConversationStateListener listener;
+
+		public ConversationStatemachine(WorldContext world, ControllerContext controllers, Resources res, ConversationStateListener listener) {
+			this.world = world;
+			this.player = world.model.player;
+			this.controllers = controllers;
+			this.res = res;
+			this.listener = listener;
+		}
+
+		public void setCurrentNPC(Monster currentNPC) { this.npc = currentNPC; }
+		public Monster getCurrentNPC() { return npc; }
+		public String getCurrentPhraseID() { return phraseID; }
+
+		public void playerSelectedReply(Reply r) {
+			applyReplyEffect(player, r);
+			proceedToPhrase(r.nextPhrase);
+		}
+
+		public void playerSelectedNextStep() {
+			playerSelectedReply(currentPhrase.replies[0]);
+		}
+
+		public interface ConversationStateListener {
+			void onTextPhraseReached(String message, Actor actor);
+			void onConversationEnded();
+			void onConversationEndedWithShop(Monster npc);
+			void onConversationEndedWithCombat(Monster npc);
+			void onConversationEndedWithRemoval(Monster npc);
+			void onPlayerReceivedRewards(ConversationController.PhraseRewards phraseRewards);
+			void onConversationCanProceedWithNext();
+			void onConversationHasReply(Reply r, String message);
+		}
+
+		private void setCurrentPhrase(String phraseID) {
+			this.phraseID = phraseID;
+			this.currentPhrase = world.conversationLoader.loadPhrase(phraseID, conversationCollection, res);
+			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
+				if (currentPhrase == null) currentPhrase = new Phrase("(phrase \"" + phraseID + "\" not implemented yet)", null, null);
+			}
+		}
+
+		public void proceedToPhrase(String phraseID) {
+			if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_CLOSE)) {
+				listener.onConversationEnded();
+				return;
+			} else if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_SHOP)) {
+				listener.onConversationEndedWithShop(npc);
+				return;
+			} else if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_ATTACK)) {
+				endConversationWithCombat();
+				return;
+			} else if (phraseID.equalsIgnoreCase(ConversationCollection.PHRASE_REMOVE)) {
+				endConversationWithRemovingNPC();
+				return;
+			}
+
+			setCurrentPhrase(phraseID);
+
+			ConversationController.PhraseRewards phraseRewards = controllers.conversationController.applyPhraseRewards(player, currentPhrase);
+			if (phraseRewards != null) {
+				listener.onPlayerReceivedRewards(phraseRewards);
+			}
+
+			if (currentPhrase.message == null) {
+				for (Reply r : currentPhrase.replies) {
+					if (!canSelectReply(world, r)) continue;
+					applyReplyEffect(player, r);
+					proceedToPhrase(r.nextPhrase);
+					return;
+				}
+			}
+
+			String message = getDisplayMessage(currentPhrase, player);
+			listener.onTextPhraseReached(message, npc);
+
+			requestReplies();
+		}
+
+		private void endConversationWithRemovingNPC() {
+			controllers.monsterSpawnController.remove(world.model.currentMap, npc);
+			listener.onConversationEndedWithRemoval(npc);
+		}
+
+		private void endConversationWithCombat() {
+			npc.forceAggressive();
+			controllers.combatController.setCombatSelection(npc);
+			controllers.combatController.enterCombat(CombatController.BEGIN_TURN_PLAYER);
+			listener.onConversationEndedWithCombat(npc);
+		}
+
+		private void requestReplies() {
+			if (hasOnlyOneNextReply()) {
+				listener.onConversationCanProceedWithNext();
+				return;
+			}
+
+			for (Reply r : currentPhrase.replies) {
+				if (!canSelectReply(world, r)) continue;
+				listener.onConversationHasReply(r, getDisplayMessage(r, player));
+			}
+		}
+
+		public void proceedToRestoredState(String phraseID) {
+			setCurrentPhrase(phraseID);
+			requestReplies();
+		}
+
+		public boolean hasOnlyOneNextReply() {
+			if (currentPhrase.replies == null) return false;
+			if (currentPhrase.replies.length != 1) return false;
+			final Reply singleReply = currentPhrase.replies[0];
+			if (!singleReply.text.equals(ConversationCollection.REPLY_NEXT)) return false;
+			if (!canSelectReply(world, singleReply)) return false;
+			return true;
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
index c1191f77b..d43cc65a4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java
@@ -6,42 +6,42 @@ import com.gpl.rpg.AndorsTrail.controller.listeners.GameRoundListeners;
 import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
 
 public final class GameRoundController implements TimedMessageTask.Callback {
-    
-    private final ControllerContext controllers;
-    private final WorldContext world;
-    private final TimedMessageTask roundTimer;
+
+	private final ControllerContext controllers;
+	private final WorldContext world;
+	private final TimedMessageTask roundTimer;
 	public final GameRoundListeners gameRoundListeners = new GameRoundListeners();
-	
+
 	public GameRoundController(ControllerContext controllers, WorldContext world) {
-    	this.controllers = controllers;
-    	this.world = world;
-    	this.roundTimer = new TimedMessageTask(this, Constants.TICK_DELAY, true);
-    }
-	
-    private int ticksUntilNextRound = Constants.TICKS_PER_ROUND;
-    private int ticksUntilNextFullRound = Constants.TICKS_PER_FULLROUND;
+		this.controllers = controllers;
+		this.world = world;
+		this.roundTimer = new TimedMessageTask(this, Constants.TICK_DELAY, true);
+	}
+
+	private int ticksUntilNextRound = Constants.TICKS_PER_ROUND;
+	private int ticksUntilNextFullRound = Constants.TICKS_PER_FULLROUND;
 
 	@Override
 	public boolean onTick(TimedMessageTask task) {
 		if (!world.model.uiSelections.isMainActivityVisible) return false;
-    	if (world.model.uiSelections.isInCombat) return false;
-    	
-    	onNewTick();
+		if (world.model.uiSelections.isInCombat) return false;
 
-    	--ticksUntilNextRound;
-    	if (ticksUntilNextRound <= 0) {
-    		onNewRound();
-    		restartWaitForNextRound();
-    	}
-    	
-    	--ticksUntilNextFullRound;
-    	if (ticksUntilNextFullRound <= 0) {
-    		onNewFullRound();
-    		restartWaitForNextFullRound();
-    	}
-    	
-    	return true;
-    }
+		onNewTick();
+
+		--ticksUntilNextRound;
+		if (ticksUntilNextRound <= 0) {
+			onNewRound();
+			restartWaitForNextRound();
+		}
+
+		--ticksUntilNextFullRound;
+		if (ticksUntilNextFullRound <= 0) {
+			onNewFullRound();
+			restartWaitForNextFullRound();
+		}
+
+		return true;
+	}
 
 	public void resetRoundTimers() {
 		restartWaitForNextRound();
@@ -52,43 +52,43 @@ public final class GameRoundController implements TimedMessageTask.Callback {
 		world.model.uiSelections.isMainActivityVisible = true;
 		roundTimer.start();
 	}
-    
-    private void restartWaitForNextFullRound() {
-    	ticksUntilNextFullRound = Constants.TICKS_PER_FULLROUND;
+
+	private void restartWaitForNextFullRound() {
+		ticksUntilNextFullRound = Constants.TICKS_PER_FULLROUND;
 	}
 
 	private void restartWaitForNextRound() {
-    	ticksUntilNextRound = Constants.TICKS_PER_ROUND;
+		ticksUntilNextRound = Constants.TICKS_PER_ROUND;
 	}
 
 	public void pause() {
-    	roundTimer.stop();
-    	world.model.uiSelections.isMainActivityVisible = false;
-    }
+		roundTimer.stop();
+		world.model.uiSelections.isMainActivityVisible = false;
+	}
 
 	public void onNewFullRound() {
 		controllers.mapController.resetMapsNotRecentlyVisited();
 		controllers.actorStatsController.applyConditionsToMonsters(world.model.currentMap, true);
-    	controllers.actorStatsController.applyConditionsToPlayer(world.model.player, true);
+		controllers.actorStatsController.applyConditionsToPlayer(world.model.player, true);
 		gameRoundListeners.onNewFullRound();
-    }
-    
-    private void onNewRound() {
+	}
+
+	private void onNewRound() {
 		onNewMonsterRound();
-    	onNewPlayerRound();
+		onNewPlayerRound();
 		gameRoundListeners.onNewRound();
-    }
-    public void onNewPlayerRound() {
-    	controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false);
-    	controllers.actorStatsController.applySkillEffectsForNewRound(world.model.player, world.model.currentMap);
-    }
-    public void onNewMonsterRound() {
-    	controllers.actorStatsController.applyConditionsToMonsters(world.model.currentMap, false);
-    }
-    
+	}
+	public void onNewPlayerRound() {
+		controllers.actorStatsController.applyConditionsToPlayer(world.model.player, false);
+		controllers.actorStatsController.applySkillEffectsForNewRound(world.model.player, world.model.currentMap);
+	}
+	public void onNewMonsterRound() {
+		controllers.actorStatsController.applyConditionsToMonsters(world.model.currentMap, false);
+	}
+
 	private void onNewTick() {
-    	controllers.monsterMovementController.moveMonsters();
-    	controllers.monsterSpawnController.maybeSpawn(world.model.currentMap, world.model.currentTileMap);
+		controllers.monsterMovementController.moveMonsters();
+		controllers.monsterSpawnController.maybeSpawn(world.model.currentMap, world.model.currentTileMap);
 		controllers.monsterMovementController.attackWithAgressiveMonsters();
 		controllers.effectController.updateSplatters(world.model.currentMap);
 		gameRoundListeners.onNewTick();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
index 4c056f1d8..02a3f3431 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/InputController.java
@@ -11,17 +11,17 @@ import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class InputController implements OnClickListener, OnLongClickListener{
 	private final ControllerContext controllers;
-    private final WorldContext world;
+	private final WorldContext world;
 
 	private final Coord lastTouchPosition_tileCoords = new Coord();
-    private int lastTouchPosition_dx = 0;
-    private int lastTouchPosition_dy = 0;
-    private long lastTouchEventTime = 0;
+	private int lastTouchPosition_dx = 0;
+	private int lastTouchPosition_dy = 0;
+	private long lastTouchEventTime = 0;
 
 	public InputController(ControllerContext controllers, WorldContext world) {
-    	this.controllers = controllers;
-    	this.world = world;
-    }
+		this.controllers = controllers;
+		this.world = world;
+	}
 
 	public boolean onKeyboardAction(int keyCode) {
 		switch (keyCode) {
@@ -51,7 +51,7 @@ public final class InputController implements OnClickListener, OnLongClickListen
 	}
 	public void onRelativeMovement(int dx, int dy) {
 		if (!allowInputInterval()) return;
-    	if (world.model.uiSelections.isInCombat) {
+		if (world.model.uiSelections.isInCombat) {
 			controllers.combatController.executeMoveAttack(dx, dy);
 		} else {
 			controllers.movementController.startMovement(dx, dy, null);
@@ -61,13 +61,13 @@ public final class InputController implements OnClickListener, OnLongClickListen
 	public void onKeyboardCancel() {
 		controllers.movementController.stopMovement();
 	}
-	
+
 	@Override
 	public void onClick(View arg0) {
 		if (!world.model.uiSelections.isInCombat) return;
 		onRelativeMovement(lastTouchPosition_dx, lastTouchPosition_dy);
-    }
-    
+	}
+
 	@Override
 	public boolean onLongClick(View arg0) {
 		if (world.model.uiSelections.isInCombat) {
@@ -75,19 +75,19 @@ public final class InputController implements OnClickListener, OnLongClickListen
 			if (lastTouchPosition_dx == 0 && lastTouchPosition_dy == 0) return false;
 			if (Math.abs(lastTouchPosition_dx) > 1) return false;
 			if (Math.abs(lastTouchPosition_dy) > 1) return false;
-				
+
 			controllers.combatController.setCombatSelection(lastTouchPosition_tileCoords);
 			return true;
 		}
 		return false;
-    }
-    
-    private boolean allowInputInterval() {
+	}
+
+	private boolean allowInputInterval() {
 		final long now = System.currentTimeMillis();
 		if ((now - lastTouchEventTime) < Constants.MINIMUM_INPUT_INTERVAL) return false;
 		lastTouchEventTime = now;
 		return true;
-    }
+	}
 
 	public void onTouchCancel() {
 		controllers.movementController.stopMovement();
@@ -97,9 +97,9 @@ public final class InputController implements OnClickListener, OnLongClickListen
 		lastTouchPosition_tileCoords.set(tile_x, tile_y);
 		lastTouchPosition_dx = tile_x - world.model.player.position.x;
 		lastTouchPosition_dy = tile_y - world.model.player.position.y;
-		
+
 		if (world.model.uiSelections.isInCombat) return false;
-			
+
 		controllers.movementController.startMovement(lastTouchPosition_dx, lastTouchPosition_dy, lastTouchPosition_tileCoords);
 		return true;
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
index 0e6512855..22734c3e6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java
@@ -15,83 +15,83 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 public final class ItemController {
-	
+
 	private final ControllerContext controllers;
-    private final WorldContext world;
-    public final QuickSlotListeners quickSlotListeners = new QuickSlotListeners();
+	private final WorldContext world;
+	public final QuickSlotListeners quickSlotListeners = new QuickSlotListeners();
 
 	public ItemController(ControllerContext controllers, WorldContext world) {
-    	this.controllers = controllers;
-    	this.world = world;
-    }
-	
+		this.controllers = controllers;
+		this.world = world;
+	}
+
 	public void dropItem(ItemType type, int quantity) {
 		if (world.model.player.inventory.getItemQuantity(type.id) < quantity) return;
 		world.model.player.inventory.removeItem(type.id, quantity);
 		world.model.currentMap.itemDropped(type, quantity, world.model.player.position);
-    }
+	}
 
 	public void equipItem(ItemType type, Inventory.WearSlot slot) {
 		if (!type.isEquippable()) return;
 		final Player player = world.model.player;
-    	if (world.model.uiSelections.isInCombat) {
-    		boolean changed = controllers.actorStatsController.useAPs(player, player.getReequipCost());
-    		if (!changed) return;
-    	}
-		
+		if (world.model.uiSelections.isInCombat) {
+			boolean changed = controllers.actorStatsController.useAPs(player, player.getReequipCost());
+			if (!changed) return;
+		}
+
 		if (!player.inventory.removeItem(type.id, 1)) return;
-		
+
 		unequipSlot(player, slot);
 		if (type.isTwohandWeapon()) unequipSlot(player, Inventory.WearSlot.shield);
 		else if (slot == Inventory.WearSlot.shield) {
 			ItemType currentWeapon = player.inventory.getItemTypeInWearSlot(Inventory.WearSlot.weapon);
 			if (currentWeapon != null && currentWeapon.isTwohandWeapon()) unequipSlot(player, Inventory.WearSlot.weapon);
 		}
-			
+
 		player.inventory.setItemTypeInWearSlot(slot, type);
 		controllers.actorStatsController.addConditionsFromEquippedItem(player, type);
 		controllers.actorStatsController.recalculatePlayerStats(player);
-    }
+	}
 
-   	public void unequipSlot(ItemType type, Inventory.WearSlot slot) {
+	public void unequipSlot(ItemType type, Inventory.WearSlot slot) {
 		if (!type.isEquippable()) return;
 		final Player player = world.model.player;
 		if (player.inventory.isEmptySlot(slot)) return;
-    	
+
 		if (world.model.uiSelections.isInCombat) {
 			boolean changed = controllers.actorStatsController.useAPs(player, player.getReequipCost());
-    		if (!changed) return;
-    	}
-    	
+			if (!changed) return;
+		}
+
 		unequipSlot(player, slot);
 		controllers.actorStatsController.recalculatePlayerStats(player);
-    }
+	}
 
-   	private void unequipSlot(Player player, Inventory.WearSlot slot) {
-   		ItemType removedItemType = player.inventory.getItemTypeInWearSlot(slot);
-   		if (removedItemType == null) return;
+	private void unequipSlot(Player player, Inventory.WearSlot slot) {
+		ItemType removedItemType = player.inventory.getItemTypeInWearSlot(slot);
+		if (removedItemType == null) return;
 		player.inventory.addItem(removedItemType);
 		player.inventory.setItemTypeInWearSlot(slot, null);
 		controllers.actorStatsController.removeConditionsFromUnequippedItem(player, removedItemType);
-    }
-    
-    public void useItem(ItemType type) {
-    	if (!type.isUsable()) return;
-    	final Player player = world.model.player;
-    	if (world.model.uiSelections.isInCombat) {
-    		boolean changed = controllers.actorStatsController.useAPs(player, player.getUseItemCost());
-    		if (!changed) return;
-    	}
-    	
-    	if (!player.inventory.removeItem(type.id, 1)) return;
-    	
-    	controllers.actorStatsController.applyUseEffect(player, null, type.effects_use);
-    	world.model.statistics.addItemUsage(type);
-		
-    	//TODO: provide feedback that the item has been used.
-    	//context.mainActivity.message(androidContext.getResources().getString(R.string.inventory_item_used, type.name));
-    }
-    
+	}
+
+	public void useItem(ItemType type) {
+		if (!type.isUsable()) return;
+		final Player player = world.model.player;
+		if (world.model.uiSelections.isInCombat) {
+			boolean changed = controllers.actorStatsController.useAPs(player, player.getUseItemCost());
+			if (!changed) return;
+		}
+
+		if (!player.inventory.removeItem(type.id, 1)) return;
+
+		controllers.actorStatsController.applyUseEffect(player, null, type.effects_use);
+		world.model.statistics.addItemUsage(type);
+
+		//TODO: provide feedback that the item has been used.
+		//context.mainActivity.message(androidContext.getResources().getString(R.string.inventory_item_used, type.name));
+	}
+
 	public void playerSteppedOnLootBag(Loot loot) {
 		if (pickupLootBagWithoutConfirmation(loot)) {
 			controllers.mapController.worldEventListeners.onPlayerPickedUpGroundLoot(loot);
@@ -102,7 +102,7 @@ public final class ItemController {
 			consumeNonItemLoot(loot);
 		}
 	}
-	
+
 	public void lootMonsterBags(Collection<Loot> killedMonsterBags, int totalExpThisFight) {
 		if (pickupLootBagsWithoutConfirmation(killedMonsterBags)) {
 			controllers.mapController.worldEventListeners.onPlayerPickedUpMonsterLoot(killedMonsterBags, totalExpThisFight);
@@ -141,7 +141,7 @@ public final class ItemController {
 			player.attackCost = 0;
 			player.criticalMultiplier = weapon.effects_equip.stats.setCriticalMultiplier;
 		}
-		
+
 		applyInventoryEffects(player, Inventory.WearSlot.weapon);
 		applyInventoryEffects(player, Inventory.WearSlot.shield);
 		SkillController.applySkillEffectsFromFightingStyles(player);
@@ -173,7 +173,7 @@ public final class ItemController {
 		if (type.effects_equip != null && type.effects_equip.stats != null)
 		controllers.actorStatsController.applyAbilityEffects(player, type.effects_equip.stats, 1);
 	}
-	
+
 	public static void recalculateHitEffectsFromWornItems(Player player) {
 		ArrayList<ItemTraits_OnUse> effects = null;
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
@@ -181,11 +181,11 @@ public final class ItemController {
 			if (type == null) continue;
 			ItemTraits_OnUse e = type.effects_hit;
 			if (e == null) continue;
-			
+
 			if (effects == null) effects = new ArrayList<ItemTraits_OnUse>();
 			effects.add(e);
 		}
-		
+
 		if (effects != null) {
 			ItemTraits_OnUse[] effects_ = new ItemTraits_OnUse[effects.size()];
 			effects_ = effects.toArray(effects_);
@@ -194,7 +194,7 @@ public final class ItemController {
 			player.onHitEffects = null;
 		}
 	}
-	
+
 	public void consumeNonItemLoot(Loot loot) {
 		// Experience will be given as soon as the monster is killed.
 		world.model.player.inventory.gold += loot.gold;
@@ -210,7 +210,7 @@ public final class ItemController {
 	public void pickupAll(Loot loot) {
 		world.model.player.inventory.add(loot.items);
 		consumeNonItemLoot(loot);
-    	loot.clear();
+		loot.clear();
 	}
 	public void pickupAll(Iterable<Loot> lootBags) {
 		for(Loot l : lootBags) {
@@ -224,7 +224,7 @@ public final class ItemController {
 		controllers.mapController.mapLayoutListeners.onLootBagRemoved(world.model.currentMap, loot.position);
 		return true; // The bag was removed.
 	}
-	
+
 	public boolean removeLootBagIfEmpty(final Iterable<Loot> lootBags) {
 		boolean isEmpty = true;
 		for (Loot l : lootBags) {
@@ -232,9 +232,9 @@ public final class ItemController {
 		}
 		return isEmpty;
 	}
-	
+
 	private static int getMarketPriceFactor(Player player) {
-		return Constants.MARKET_PRICEFACTOR_PERCENT 
+		return Constants.MARKET_PRICEFACTOR_PERCENT
 			- player.getSkillLevel(SkillCollection.SkillID.barter) * SkillCollection.PER_SKILLPOINT_INCREASE_BARTER_PRICEFACTOR_PERCENTAGE;
 	}
 	public static int getBuyingPrice(Player player, ItemType itemType) {
@@ -271,14 +271,14 @@ public final class ItemController {
 		model.statistics.addGoldSpent(price);
 		return true;
 	}
-	
+
 
 	public static String describeItemForListView(ItemEntry item, Player player) {
 		StringBuilder sb = new StringBuilder(item.itemType.getName(player));
 		if (item.quantity > 1) {
 			sb.append(" (");
 			sb.append(item.quantity);
-			sb.append(')'); 
+			sb.append(')');
 		}
 		if (item.itemType.effects_equip != null) {
 			AbilityModifierTraits t = item.itemType.effects_equip.stats;
@@ -333,7 +333,7 @@ public final class ItemController {
 			addSpace = true;
 		}
 	}
-	
+
 	public static void describeBlockEffect(int blockChance, int damageResistance, StringBuilder sb) {
 		if (blockChance != 0) {
 			sb.append(blockChance);
@@ -341,7 +341,7 @@ public final class ItemController {
 		}
 		if (damageResistance != 0) {
 			sb.append('/');
-			sb.append(damageResistance);	
+			sb.append(damageResistance);
 		}
 	}
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
index 3f3f51ea4..64cb1e89c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MapController.java
@@ -15,18 +15,18 @@ import com.gpl.rpg.AndorsTrail.model.map.ReplaceableMapSection;
 import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class MapController {
-    
-    private final ControllerContext controllers;
-    private final WorldContext world;
-    public final WorldEventListeners worldEventListeners = new WorldEventListeners();
+
+	private final ControllerContext controllers;
+	private final WorldContext world;
+	public final WorldEventListeners worldEventListeners = new WorldEventListeners();
 	public final MapLayoutListeners mapLayoutListeners = new MapLayoutListeners();
 
 	public MapController(ControllerContext controllers, WorldContext world) {
-    	this.controllers = controllers;
-    	this.world = world;
-    }
-    
-    public void handleMapEvent(MapObject o, Coord position) {
+		this.controllers = controllers;
+		this.world = world;
+	}
+
+	public void handleMapEvent(MapObject o, Coord position) {
 		switch (o.type) {
 		case sign:
 			if (o.id == null || o.id.length() <= 0) return;
@@ -43,14 +43,14 @@ public final class MapController {
 			break;
 		}
 	}
-    
-    private void steppedOnRestArea(MapObject area) {
-    	if (controllers.preferences.confirmRest) {
+
+	private void steppedOnRestArea(MapObject area) {
+		if (controllers.preferences.confirmRest) {
 			worldEventListeners.onPlayerSteppedOnRestArea(area);
 		} else {
 			rest(area);
 		}
-    }
+	}
 
 	public void steppedOnMonster(Monster m, Coord p) {
 		if (m.isAgressive()) {
@@ -70,7 +70,7 @@ public final class MapController {
 		final Player player = world.model.player;
 		int lostExp = player.getCurrentLevelExperience() * Constants.PERCENT_EXP_LOST_WHEN_DIED / 100;
 		lostExp -= lostExp * player.getSkillLevel(SkillCollection.SkillID.lowerExploss) * SkillCollection.PER_SKILLPOINT_INCREASE_EXPLOSS_PERCENT / 100;
-		
+
 		if (lostExp < 0) lostExp = 0;
 		controllers.actorStatsController.addExperience(-lostExp);
 		world.model.statistics.addPlayerDeath(lostExp);
@@ -78,7 +78,7 @@ public final class MapController {
 		lotsOfTimePassed();
 		worldEventListeners.onPlayerDied(lostExp);
 	}
-	
+
 	public void lotsOfTimePassed() {
 		final Player player = world.model.player;
 		controllers.actorStatsController.removeAllTemporaryConditions(player);
@@ -97,7 +97,7 @@ public final class MapController {
 		world.model.player.setSpawnPlace(world.model.currentMap.name, area.id);
 		worldEventListeners.onPlayerRested();
 	}
-	
+
 	public boolean canEnterKeyArea(MapObject area) {
 		if (world.model.player.hasExactQuestProgress(area.requireQuestProgress)) return true;
 		worldEventListeners.onPlayerSteppedOnKeyArea(area);
@@ -110,7 +110,7 @@ public final class MapController {
 			if (m.isRecentlyVisited()) continue;
 			if (m.hasResetTemporaryData()) continue;
 			m.resetTemporaryData();
-    	}
+		}
 	}
 
 	public void applyCurrentMapReplacements(final Resources res, boolean updateWorldmap) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
index d74ff25d9..5f74e6d66 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java
@@ -16,42 +16,42 @@ import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public final class MonsterMovementController implements EvaluateWalkable {
 	private final ControllerContext controllers;
-    private final WorldContext world;
-    public final MonsterMovementListeners monsterMovementListeners = new MonsterMovementListeners();
+	private final WorldContext world;
+	public final MonsterMovementListeners monsterMovementListeners = new MonsterMovementListeners();
 
 	public MonsterMovementController(ControllerContext controllers, WorldContext world) {
 		this.controllers = controllers;
-    	this.world = world;
-    }
-	
+		this.world = world;
+	}
+
 	public void moveMonsters() {
-    	long currentTime = System.currentTimeMillis();
-    	
-    	for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) {
-	    	for (Monster m : a.monsters) {
-	    		if (m.nextActionTime <= currentTime) {
-	    			moveMonster(m, a);
-	    		}
-	    	}
-    	}
-    }
-	
+		long currentTime = System.currentTimeMillis();
+
+		for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) {
+			for (Monster m : a.monsters) {
+				if (m.nextActionTime <= currentTime) {
+					moveMonster(m, a);
+				}
+			}
+		}
+	}
+
 	public void attackWithAgressiveMonsters() {
-    	for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) {
-	    	for (Monster m : a.monsters) {
-	    		if (!m.isAgressive()) continue;
-	    		if (!m.isAdjacentTo(world.model.player)) continue;
-	    		
-	    		int aggressionChanceBias = world.model.player.getSkillLevel(SkillCollection.SkillID.evasion) * SkillCollection.PER_SKILLPOINT_INCREASE_EVASION_MONSTER_ATTACK_CHANCE_PERCENTAGE;
-	    		if (Constants.roll100(Constants.MONSTER_AGGRESSION_CHANCE_PERCENT - aggressionChanceBias)) {
-	    			monsterMovementListeners.onMonsterSteppedOnPlayer(m);
-	    			controllers.combatController.monsterSteppedOnPlayer(m);
-	    			return;
-	    		}
-	    	}
-    	}
-    }
-	
+		for (MonsterSpawnArea a : world.model.currentMap.spawnAreas) {
+			for (Monster m : a.monsters) {
+				if (!m.isAgressive()) continue;
+				if (!m.isAdjacentTo(world.model.player)) continue;
+
+				int aggressionChanceBias = world.model.player.getSkillLevel(SkillCollection.SkillID.evasion) * SkillCollection.PER_SKILLPOINT_INCREASE_EVASION_MONSTER_ATTACK_CHANCE_PERCENTAGE;
+				if (Constants.roll100(Constants.MONSTER_AGGRESSION_CHANCE_PERCENT - aggressionChanceBias)) {
+					monsterMovementListeners.onMonsterSteppedOnPlayer(m);
+					controllers.combatController.monsterSteppedOnPlayer(m);
+					return;
+				}
+			}
+		}
+	}
+
 	public static boolean monsterCanMoveTo(final PredefinedMap map, final LayeredTileMap tilemap, final CoordRect p) {
 		if (tilemap != null) {
 			if (!tilemap.isWalkable(p)) return false;
@@ -62,31 +62,31 @@ public final class MonsterMovementController implements EvaluateWalkable {
 			if (m.type == MapObject.MapObjectType.newmap) return false;
 			if (m.type == MapObject.MapObjectType.keyarea) return false;
 		}
-    	return true;
+		return true;
 	}
-    
+
 	private void moveMonster(final Monster m, final MonsterSpawnArea area) {
-        PredefinedMap map = world.model.currentMap;
+		PredefinedMap map = world.model.currentMap;
 		LayeredTileMap tileMap = world.model.currentTileMap;
 		m.nextActionTime += getMillisecondsPerMove(m);
-    	if (m.movementDestination == null) {
-    		// Monster has waited and should start to move again.
-    		m.movementDestination = new Coord(m.position);
-    		if (Constants.rnd.nextBoolean()) {
-    			m.movementDestination.x = area.area.topLeft.x + Constants.rnd.nextInt(area.area.size.width);
-    		} else {
-    			m.movementDestination.y = area.area.topLeft.y + Constants.rnd.nextInt(area.area.size.height);
-    		}
-    	} else if (m.position.equals(m.movementDestination)) {
-    		// Monster has been moving and arrived at the destination.
-    		cancelCurrentMonsterMovement(m);
-    	} else {
-    		determineMonsterNextPosition(m, area, world.model.player.position);
-    		
-    		if (!monsterCanMoveTo(map, tileMap, m.nextPosition)) {
-    			cancelCurrentMonsterMovement(m);
-    			return;
-    		}
+		if (m.movementDestination == null) {
+			// Monster has waited and should start to move again.
+			m.movementDestination = new Coord(m.position);
+			if (Constants.rnd.nextBoolean()) {
+				m.movementDestination.x = area.area.topLeft.x + Constants.rnd.nextInt(area.area.size.width);
+			} else {
+				m.movementDestination.y = area.area.topLeft.y + Constants.rnd.nextInt(area.area.size.height);
+			}
+		} else if (m.position.equals(m.movementDestination)) {
+			// Monster has been moving and arrived at the destination.
+			cancelCurrentMonsterMovement(m);
+		} else {
+			determineMonsterNextPosition(m, area, world.model.player.position);
+
+			if (!monsterCanMoveTo(map, tileMap, m.nextPosition)) {
+				cancelCurrentMonsterMovement(m);
+				return;
+			}
 			if (m.nextPosition.contains(world.model.player.position)) {
 				if (!m.isAgressive()) {
 					cancelCurrentMonsterMovement(m);
@@ -95,19 +95,19 @@ public final class MonsterMovementController implements EvaluateWalkable {
 				monsterMovementListeners.onMonsterSteppedOnPlayer(m);
 				controllers.combatController.monsterSteppedOnPlayer(m);
 			} else {
-                moveMonsterToNextPosition(m, map);
+				moveMonsterToNextPosition(m, map);
 			}
-    	}
+		}
 	}
-    
-    private void determineMonsterNextPosition(Monster m, MonsterSpawnArea area, Coord playerPosition) {
-        if (m.getMovementAggressionType() == MonsterType.AggressionType.protectSpawn) {
-    		if (area.area.contains(playerPosition)) {
-    			if (findPathFor(m, playerPosition)) return;
-    		}
-    	}
-		
-    	// Monster is moving in a straight line.
+
+	private void determineMonsterNextPosition(Monster m, MonsterSpawnArea area, Coord playerPosition) {
+		if (m.getMovementAggressionType() == MonsterType.AggressionType.protectSpawn) {
+			if (area.area.contains(playerPosition)) {
+				if (findPathFor(m, playerPosition)) return;
+			}
+		}
+
+		// Monster is moving in a straight line.
 		m.nextPosition.topLeft.set(
 				m.position.x + sgn(m.movementDestination.x - m.position.x)
 				,m.position.y + sgn(m.movementDestination.y - m.position.y)
@@ -115,20 +115,20 @@ public final class MonsterMovementController implements EvaluateWalkable {
 	}
 
 	private static void cancelCurrentMonsterMovement(final Monster m) {
-    	m.movementDestination = null;
+		m.movementDestination = null;
 		m.nextActionTime += getMillisecondsPerMove(m) * Constants.rollValue(Constants.monsterWaitTurns);
-    }
-    
-    private static int getMillisecondsPerMove(Monster m) {
-    	return Constants.MONSTER_MOVEMENT_TURN_DURATION_MS * m.getMoveCost() / m.getMaxAP();
-    }
+	}
+
+	private static int getMillisecondsPerMove(Monster m) {
+		return Constants.MONSTER_MOVEMENT_TURN_DURATION_MS * m.getMoveCost() / m.getMaxAP();
+	}
 
 	private static int sgn(int i) {
 		if (i <= -1) return -1;
 		if (i >= 1) return 1;
 		return 0;
 	}
-	
+
 	private final PathFinder pathfinder = new PathFinder(Constants.MAX_MAP_WIDTH, Constants.MAX_MAP_HEIGHT, this);
 	public boolean findPathFor(Monster m, Coord to) {
 		return pathfinder.findPathBetween(m.rectPosition, to, m.nextPosition);
@@ -139,9 +139,9 @@ public final class MonsterMovementController implements EvaluateWalkable {
 		return monsterCanMoveTo(world.model.currentMap, world.model.currentTileMap, r);
 	}
 
-    public void moveMonsterToNextPosition(Monster m, PredefinedMap map) {
-        CoordRect previousPosition = new CoordRect(new Coord(m.position), m.rectPosition.size);
-        m.position.set(m.nextPosition.topLeft);
-        monsterMovementListeners.onMonsterMoved(map, m, previousPosition);
-    }
+	public void moveMonsterToNextPosition(Monster m, PredefinedMap map) {
+		CoordRect previousPosition = new CoordRect(new Coord(m.position), m.rectPosition.size);
+		m.position.set(m.nextPosition.topLeft);
+		monsterMovementListeners.onMonsterMoved(map, m, previousPosition);
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java
index ad7b2f759..37e1c6bea 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java
@@ -15,13 +15,13 @@ import com.gpl.rpg.AndorsTrail.util.Size;
 public final class MonsterSpawningController {
 	private final ControllerContext controllers;
 	private final WorldContext world;
-    public final MonsterSpawnListeners monsterSpawnListeners = new MonsterSpawnListeners();
+	public final MonsterSpawnListeners monsterSpawnListeners = new MonsterSpawnListeners();
 
 	public MonsterSpawningController(ControllerContext controllers, WorldContext world) {
-    	this.controllers = controllers;
-    	this.world = world;
-    }
-	
+		this.controllers = controllers;
+		this.world = world;
+	}
+
 	public void spawnAllInArea(PredefinedMap map, LayeredTileMap tileMap, MonsterSpawnArea area, boolean respawnUniqueMonsters) {
 		while (area.isSpawnable(respawnUniqueMonsters)) {
 			final boolean wasAbleToSpawn = spawnInArea(map, tileMap, area, null);
@@ -29,7 +29,7 @@ public final class MonsterSpawningController {
 		}
 		controllers.actorStatsController.healAllMonsters(area);
 	}
-	
+
 	public void maybeSpawn(PredefinedMap map, LayeredTileMap tileMap) {
 		for (MonsterSpawnArea a : map.spawnAreas) {
 			if (!a.isSpawnable(false)) continue;
@@ -37,7 +37,7 @@ public final class MonsterSpawningController {
 			spawnInArea(map, tileMap, a, world.model.player.position);
 		}
 	}
-	
+
 	public void spawnAll(PredefinedMap map, LayeredTileMap tileMap) {
 		boolean respawnUniqueMonsters = false;
 		if (!map.visited) respawnUniqueMonsters = true;
@@ -45,7 +45,7 @@ public final class MonsterSpawningController {
 			spawnAllInArea(map, tileMap, a, respawnUniqueMonsters);
 		}
 	}
-	
+
 	private boolean spawnInArea(PredefinedMap map, LayeredTileMap tileMap, MonsterSpawnArea a, Coord playerPosition) {
 		return spawnInArea(map, tileMap, a, a.getRandomMonsterType(world), playerPosition);
 	}
@@ -57,7 +57,7 @@ public final class MonsterSpawningController {
 		monsterSpawnListeners.onMonsterSpawned(map, m);
 		return true;
 	}
-	
+
 	public static Coord getRandomFreePosition(PredefinedMap map, LayeredTileMap tileMap, CoordRect area, Size requiredSize, Coord playerPosition) {
 		CoordRect p = new CoordRect(requiredSize);
 		for(int i = 0; i < 100; ++i) {
@@ -67,10 +67,10 @@ public final class MonsterSpawningController {
 			if (!MonsterMovementController.monsterCanMoveTo(map, tileMap, p)) continue;
 			if (playerPosition != null && p.contains(playerPosition)) continue;
 			return p.topLeft;
-		} 
+		}
 		return null; // Couldn't find a free spot.
 	}
-	
+
 	public void remove(PredefinedMap map, Monster m) {
 		for (MonsterSpawnArea a : map.spawnAreas) {
 			a.remove(m);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
index df03799e8..5c96ee7f2 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/MovementController.java
@@ -23,25 +23,25 @@ import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
 
 public final class MovementController implements TimedMessageTask.Callback {
 	private final ControllerContext controllers;
-    private final WorldContext world;
-    private final TimedMessageTask movementHandler;
-    public final PlayerMovementListeners playerMovementListeners = new PlayerMovementListeners(); 
+	private final WorldContext world;
+	private final TimedMessageTask movementHandler;
+	public final PlayerMovementListeners playerMovementListeners = new PlayerMovementListeners();
 
 	public MovementController(ControllerContext controllers, WorldContext world) {
-    	this.controllers = controllers;
-    	this.world = world;
-    	this.movementHandler = new TimedMessageTask(this, Constants.MINIMUM_INPUT_INTERVAL, false);
-    }
-	
+		this.controllers = controllers;
+		this.world = world;
+		this.movementHandler = new TimedMessageTask(this, Constants.MINIMUM_INPUT_INTERVAL, false);
+	}
+
 	public void placePlayerAsyncAt(final MapObject.MapObjectType objectType, final String mapName, final String placeName, final int offset_x, final int offset_y) {
-		
-		AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>()  {
+
+		AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
 			@Override
 			protected Void doInBackground(Void... arg0) {
 				stopMovement();
-				
+
 				placePlayerAt(controllers.getResources(), objectType, mapName, placeName, offset_x, offset_y);
-				
+
 				return null;
 			}
 
@@ -52,14 +52,14 @@ public final class MovementController implements TimedMessageTask.Callback {
 				playerMovementListeners.onPlayerEnteredNewMap(world.model.currentMap, world.model.player.position);
 				controllers.gameRoundController.resume();
 			}
-			
+
 		};
 		controllers.gameRoundController.pause();
 		task.execute();
-    }
-	
+	}
+
 	public void placePlayerAt(final Resources res, MapObject.MapObjectType objectType, String mapName, String placeName, int offset_x, int offset_y) {
-    	if (mapName == null || placeName == null) return;
+		if (mapName == null || placeName == null) return;
 		PredefinedMap newMap = world.maps.findPredefinedMap(mapName);
 		if (newMap == null) {
 			L.log("Cannot find map " + mapName);
@@ -71,20 +71,20 @@ public final class MovementController implements TimedMessageTask.Callback {
 			return;
 		}
 		final ModelContainer model = world.model;
-		
+
 		if (model.currentMap != null) model.currentMap.updateLastVisitTime();
 		model.player.position.set(place.position.topLeft);
 		model.player.position.x += Math.min(offset_x, place.position.size.width-1);
 		model.player.position.y += Math.min(offset_y, place.position.size.height-1);
 		model.player.lastPosition.set(model.player.position);
-		
+
 		if (!newMap.visited) {
 			playerVisitsMapFirstTime(newMap);
 		}
 
 		prepareMapAsCurrentMap(newMap, res, true);
 	}
-    
+
 	private void playerVisitsMapFirstTime(PredefinedMap m) {
 		m.reset();
 		m.createAllContainerLoot();
@@ -113,122 +113,122 @@ public final class MovementController implements TimedMessageTask.Callback {
 		return !world.model.uiSelections.isInCombat;
 	}
 
-    private void movePlayer(int dx, int dy) {
-    	if (dx == 0 && dy == 0) return;
-    	if (!mayMovePlayer()) return;
+	private void movePlayer(int dx, int dy) {
+		if (dx == 0 && dy == 0) return;
+		if (!mayMovePlayer()) return;
 
-    	if (!findWalkablePosition(dx, dy)) return;
-    	
-    	Monster m = world.model.currentMap.getMonsterAt(world.model.player.nextPosition);
+		if (!findWalkablePosition(dx, dy)) return;
+
+		Monster m = world.model.currentMap.getMonsterAt(world.model.player.nextPosition);
 		if (m != null) {
 			controllers.mapController.steppedOnMonster(m, world.model.player.nextPosition);
 			return;
 		}
 
 		moveToNextIfPossible(true);
-    }
-    
-    private boolean findWalkablePosition(int dx, int dy) {
-    	// try to move with movementAggresiveness, if that fails fall back to MOVEMENTAGGRESSIVENESS_NORMAL
-    	if (findWalkablePosition(dx, dy, controllers.preferences.movementAggressiveness)) return true;
-    	
-    	if (controllers.preferences.movementAggressiveness == AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_NORMAL) return false;
-    	
-    	return findWalkablePosition(dx, dy, AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_NORMAL);
-    }
+	}
+
+	private boolean findWalkablePosition(int dx, int dy) {
+		// try to move with movementAggresiveness, if that fails fall back to MOVEMENTAGGRESSIVENESS_NORMAL
+		if (findWalkablePosition(dx, dy, controllers.preferences.movementAggressiveness)) return true;
+
+		if (controllers.preferences.movementAggressiveness == AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_NORMAL) return false;
+
+		return findWalkablePosition(dx, dy, AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_NORMAL);
+	}
 
 	public boolean findWalkablePosition(int dx, int dy, int aggressiveness) {
-    	if (controllers.preferences.movementMethod == AndorsTrailPreferences.MOVEMENTMETHOD_STRAIGHT) {
-    		return findWalkablePosition_straight(dx, dy, aggressiveness);
-    	} else  {
-    		return findWalkablePosition_directional(dx, dy, aggressiveness);
-    	}
-    }
+		if (controllers.preferences.movementMethod == AndorsTrailPreferences.MOVEMENTMETHOD_STRAIGHT) {
+			return findWalkablePosition_straight(dx, dy, aggressiveness);
+		} else {
+			return findWalkablePosition_directional(dx, dy, aggressiveness);
+		}
+	}
 	private boolean findWalkablePosition_straight(int dx, int dy, int aggressiveness) {
-    	if (tryWalkablePosition(sgn(dx), sgn(dy), aggressiveness)) return true;                 // try moving into the direction player is pointing at
-    	if (dx == 0 || dy == 0) return false;                                                   // if moving purely east, west, north or south failed - do nothing  
-		if (abs(dx) == abs(dy) && tryWalkablePosition(sgn(dx), 0, aggressiveness)) return true; // try moving horizontally or vertically otherwise (prefer the direction where he is pointing more) 
-    	if (abs(dx) > abs(dy)) return tryWalkablePosition(sgn(dx), 0, aggressiveness);
-    	return tryWalkablePosition(0, sgn(dy), aggressiveness);
-    }
+		if (tryWalkablePosition(sgn(dx), sgn(dy), aggressiveness)) return true;				// try moving into the direction player is pointing at
+		if (dx == 0 || dy == 0) return false;												// if moving purely east, west, north or south failed - do nothing
+		if (abs(dx) == abs(dy) && tryWalkablePosition(sgn(dx), 0, aggressiveness)) return true; // try moving horizontally or vertically otherwise (prefer the direction where he is pointing more)
+		if (abs(dx) > abs(dy)) return tryWalkablePosition(sgn(dx), 0, aggressiveness);
+		return tryWalkablePosition(0, sgn(dy), aggressiveness);
+	}
 	private boolean findWalkablePosition_directional(int dx, int dy, int aggressiveness) {
-        if (tryWalkablePosition(sgn(dx), sgn(dy), aggressiveness)) return true; // try moving into the direction player is pointing at
+		if (tryWalkablePosition(sgn(dx), sgn(dy), aggressiveness)) return true; // try moving into the direction player is pointing at
 
-        if (dx == 0) { // player wants to move north or south but there is an obstacle
-            if (tryWalkablePosition( 1, sgn(dy), aggressiveness)) return true; // try moving north-east (or south-east)
-            if (tryWalkablePosition(-1, sgn(dy), aggressiveness)) return true; // try moving north-west (or south-west)
-            return false;
-        }
+		if (dx == 0) { // player wants to move north or south but there is an obstacle
+			if (tryWalkablePosition( 1, sgn(dy), aggressiveness)) return true; // try moving north-east (or south-east)
+			if (tryWalkablePosition(-1, sgn(dy), aggressiveness)) return true; // try moving north-west (or south-west)
+			return false;
+		}
 
-        if (dy == 0) { // player wants to move east or west but there is an obstacle
-            if (tryWalkablePosition(sgn(dx), 1, aggressiveness)) return true; // try moving north-east (or north-west)
-            if (tryWalkablePosition(sgn(dx),-1, aggressiveness)) return true; // try moving south-east (or south-west)
-            return false;
-        }
+		if (dy == 0) { // player wants to move east or west but there is an obstacle
+			if (tryWalkablePosition(sgn(dx), 1, aggressiveness)) return true; // try moving north-east (or north-west)
+			if (tryWalkablePosition(sgn(dx),-1, aggressiveness)) return true; // try moving south-east (or south-west)
+			return false;
+		}
 
-        if (abs(dx) >= abs(dy)) { // player wants to move more horizontally
-            if (tryWalkablePosition(sgn(dx), 0, aggressiveness)) return true; // try moving horizontally
-            if (tryWalkablePosition(0, sgn(dy), aggressiveness)) return true; // try moving vertically
-            return false;
-        } else { // player wants to move more vertically
-            if (tryWalkablePosition(0, sgn(dy), aggressiveness)) return true; // try moving vertically
-            if (tryWalkablePosition(sgn(dx), 0, aggressiveness)) return true; // try moving horizontally
-            return false;
-        }
-    }
+		if (abs(dx) >= abs(dy)) { // player wants to move more horizontally
+			if (tryWalkablePosition(sgn(dx), 0, aggressiveness)) return true; // try moving horizontally
+			if (tryWalkablePosition(0, sgn(dy), aggressiveness)) return true; // try moving vertically
+			return false;
+		} else { // player wants to move more vertically
+			if (tryWalkablePosition(0, sgn(dy), aggressiveness)) return true; // try moving vertically
+			if (tryWalkablePosition(sgn(dx), 0, aggressiveness)) return true; // try moving horizontally
+			return false;
+		}
+	}
 
 	private boolean tryWalkablePosition(int dx, int dy, int aggressiveness) {
-    	final Player player = world.model.player;
-    	player.nextPosition.set(
+		final Player player = world.model.player;
+		player.nextPosition.set(
 				player.position.x + dx
-    			,player.position.y + dy
+				,player.position.y + dy
 			);
 
-    	if (!world.model.currentTileMap.isWalkable(player.nextPosition)) return false;
-    	
+		if (!world.model.currentTileMap.isWalkable(player.nextPosition)) return false;
+
 		// allow player to enter every field when he is NORMAL
 		// prevent player from entering "non-monster-fields" when he is AGGRESSIVE
 		// prevent player from entering "monster-fields" when he is DEFENSIVE
 		if (aggressiveness == AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_NORMAL) return true;
-		
+
 		Monster m = world.model.currentMap.getMonsterAt(player.nextPosition);
 		if (m != null && !m.isAgressive()) return true; // avoid MOVEMENTAGGRESSIVENESS settings for NPCs
-		
+
 		if (aggressiveness == AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_AGGRESSIVE && m == null) return false;
 		if (aggressiveness == AndorsTrailPreferences.MOVEMENTAGGRESSIVENESS_DEFENSIVE && m != null) return false;
-		
+
 		return true;
-    }
-	
-	private static int sgn(final int v) { 
+	}
+
+	private static int sgn(final int v) {
 		if (v == 0) return 0;
 		else if (v > 0) return 1;
 		else return -1;
 	}
-	private static int abs(final int v) { 
+	private static int abs(final int v) {
 		if (v == 0) return 0;
 		else if (v > 0) return v;
 		else return -v;
 	}
-    
-    public void moveToNextIfPossible(boolean handleEvents) {
-    	final Player player = world.model.player;
-    	final PredefinedMap currentMap = world.model.currentMap;
-    	final Coord newPosition = player.nextPosition;
-    	
-    	for (MapObject o : currentMap.eventObjects) {
-    		if (o.type == MapObject.MapObjectType.keyarea) {
-	    		if (o.position.contains(newPosition)) {
-	    			if (!controllers.mapController.canEnterKeyArea(o)) return;
-	    		}
-    		}
-    	}
-		
-    	player.lastPosition.set(player.position);
-    	player.position.set(newPosition);
-    	controllers.combatController.setCombatSelection(null, null);
-    	playerMovementListeners.onPlayerMoved(newPosition, player.lastPosition);
-		
+
+	public void moveToNextIfPossible(boolean handleEvents) {
+		final Player player = world.model.player;
+		final PredefinedMap currentMap = world.model.currentMap;
+		final Coord newPosition = player.nextPosition;
+
+		for (MapObject o : currentMap.eventObjects) {
+			if (o.type == MapObject.MapObjectType.keyarea) {
+				if (o.position.contains(newPosition)) {
+					if (!controllers.mapController.canEnterKeyArea(o)) return;
+				}
+			}
+		}
+
+		player.lastPosition.set(player.position);
+		player.position.set(newPosition);
+		controllers.combatController.setCombatSelection(null, null);
+		playerMovementListeners.onPlayerMoved(newPosition, player.lastPosition);
+
 		if (handleEvents) {
 			MapObject o = currentMap.getEventObjectAt(newPosition);
 			if (o != null) {
@@ -236,11 +236,11 @@ public final class MovementController implements TimedMessageTask.Callback {
 					controllers.mapController.handleMapEvent(o, newPosition);
 				}
 			}
-	    	
-	    	Loot loot = currentMap.getBagAt(newPosition);
-	    	if (loot != null) controllers.itemController.playerSteppedOnLootBag(loot);
+
+			Loot loot = currentMap.getBagAt(newPosition);
+			if (loot != null) controllers.itemController.playerSteppedOnLootBag(loot);
 		}
-    }
+	}
 
 	public void respawnPlayer(Resources res) {
 		placePlayerAt(res, MapObject.MapObjectType.rest, world.model.player.getSpawnMap(), world.model.player.getSpawnPlace(), 0, 0);
@@ -259,7 +259,7 @@ public final class MovementController implements TimedMessageTask.Callback {
 			Coord p = getFirstMapChangeAreaPosition(map);
 			if (p != null) model.player.position.set(p);
 		}
-		
+
 		// If any monsters somehow spawned on an unwalkable tile, we move the monster to a new position on the spawnarea
 		// This could happen if we change some tile to non-walkable in a future version.
 		Coord playerPosition = model.player.position;
@@ -278,7 +278,7 @@ public final class MovementController implements TimedMessageTask.Callback {
 			if (tileMap.isWalkable(bag.position)) continue;
 			Coord p = getFirstMapChangeAreaPosition(map);
 			if (p == null) continue;
-			     if (tileMap.isWalkable(new Coord(p.x+1, p.y  ))) bag.position.set(p.x+1, p.y  );
+			if (tileMap.isWalkable(new Coord(p.x+1, p.y  ))) bag.position.set(p.x+1, p.y  );
 			else if (tileMap.isWalkable(new Coord(p.x  , p.y+1))) bag.position.set(p.x  , p.y+1);
 			else if (tileMap.isWalkable(new Coord(p.x-1, p.y  ))) bag.position.set(p.x-1, p.y  );
 			else if (tileMap.isWalkable(new Coord(p.x  , p.y-1))) bag.position.set(p.x  , p.y-1);
@@ -306,12 +306,12 @@ public final class MovementController implements TimedMessageTask.Callback {
 	public void startMovement(int dx, int dy, Coord destination) {
 		if (!mayMovePlayer()) return;
 		if (dx == 0 && dy == 0) return;
-		
+
 		movementDx = dx;
 		movementDy = dy;
 		movementHandler.start();
 	}
-	
+
 	public void stopMovement() {
 		movementHandler.stop();
 	}
@@ -319,11 +319,11 @@ public final class MovementController implements TimedMessageTask.Callback {
 	@Override
 	public boolean onTick(TimedMessageTask task) {
 		if (!world.model.uiSelections.isMainActivityVisible) return false;
-    	if (world.model.uiSelections.isInCombat) return false;
-    	
-    	movePlayer(movementDx, movementDy);
-		
-    	return true;
+		if (world.model.uiSelections.isInCombat) return false;
+
+		movePlayer(movementDx, movementDy);
+
+		return true;
 	}
 
 	public static void refreshMonsterAggressiveness(final PredefinedMap map, final Player player) {
@@ -335,7 +335,7 @@ public final class MovementController implements TimedMessageTask.Callback {
 			}
 		}
 	}
-	
+
 	public static boolean hasAdjacentAggressiveMonster(PredefinedMap map, Player player) {
 		return getAdjacentAggressiveMonster(map, player) != null;
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
index 31efbca3a..deaa18945 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/PathFinder.java
@@ -12,7 +12,7 @@ public class PathFinder {
 	private final ListOfCoords visitQueue;
 	private final EvaluateWalkable map;
 	public int iterations = 0;
-	
+
 	public PathFinder(int maxWidth, int maxHeight, EvaluateWalkable map) {
 		this.maxWidth = maxWidth;
 		this.maxHeight = maxHeight;
@@ -20,31 +20,31 @@ public class PathFinder {
 		this.visited = new boolean[maxWidth*maxHeight];
 		this.visitQueue = new ListOfCoords(maxWidth*maxHeight);
 	}
-	
+
 	public interface EvaluateWalkable {
 		public boolean isWalkable(CoordRect r);
 	}
-	
+
 	public boolean findPathBetween(final CoordRect from, final Coord to, CoordRect nextStep) {
 		iterations = 0;
 		if (from.equals(to)) return false;
-		
+
 		Coord measureDistanceTo = from.topLeft;
 		Coord p = nextStep.topLeft;
 		Arrays.fill(visited, false);
 		visitQueue.reset();
-		
+
 		visitQueue.push(to.x, to.y, 0);
 		visited[(to.y * maxWidth) + to.x] = true;
-		
+
 		while (!visitQueue.isEmpty()) {
 			visitQueue.popFirst(p);
 			++iterations;
-			
+
 			if (iterations > 100) return false;
-			
+
 			if (from.isAdjacentTo(p)) return true;
-			
+
 			p.x -= 1; visit(nextStep, measureDistanceTo);
 			p.x += 2; visit(nextStep, measureDistanceTo);
 			p.x -= 1; p.y -= 1; visit(nextStep, measureDistanceTo);
@@ -56,21 +56,21 @@ public class PathFinder {
 		}
 		return false;
 	}
-	
+
 	private void visit(CoordRect r, Coord measureDistanceTo) {
 		final int x = r.topLeft.x;
 		final int y = r.topLeft.y;
-		
+
 		if (x < 0) return;
 		if (y < 0) return;
 		if (x >= maxWidth) return;
 		if (y >= maxHeight) return;
-		
+
 		final int i = (y * maxWidth) + x;
 		if (visited[i]) return;
 		visited[i] = true;
 		if (!map.isWalkable(r)) return;
-		
+
 		int dx = (measureDistanceTo.x - x);
 		int dy = (measureDistanceTo.y - y);
 		visitQueue.push(x, y, dx * dx + dy * dy);
@@ -83,7 +83,7 @@ public class PathFinder {
 		private int lastIndex; // Index of the last coord that was inserted
 		private int frontIndex; // Index to the first coord that is not discarded
 		private static final int DISCARDED = -1;
-		
+
 		public ListOfCoords(int maxSize) {
 			this.maxIndex = maxSize-1;
 			this.coords = new int[maxSize];
@@ -94,20 +94,20 @@ public class PathFinder {
 			frontIndex = 0;
 		}
 		private static int coordsToInt(int x, int y) {
-			return ((y << 8) & 0xff00) | (x & 0xff); 
+			return ((y << 8) & 0xff00) | (x & 0xff);
 		}
 		private static void intToCoords(int c, Coord dest) {
-			dest.x = c & 0xff; 
+			dest.x = c & 0xff;
 			dest.y = (c >> 8) & 0xff;
 		}
-		
+
 		public void push(int x, int y, int weight) {
 			if (lastIndex == maxIndex) return;
 			++lastIndex;
 			coords[lastIndex] = coordsToInt(x, y);
 			weights[lastIndex] = weight;
 		}
-		
+
 		public int popFirst(Coord dest) {
 			int i = frontIndex;
 			int lowestWeightIndex = i;
@@ -122,16 +122,16 @@ public class PathFinder {
 			}
 			intToCoords(coords[lowestWeightIndex], dest);
 			weights[lowestWeightIndex] = DISCARDED;
-			
+
 			// Increase frontIndex to the first index that is not discarded.
 			while (frontIndex <= lastIndex) {
 				if (weights[frontIndex] == DISCARDED) ++frontIndex;
 				else break;
 			}
-			
+
 			return lowestWeight;
 		}
-		
+
 		public boolean isEmpty() {
 			return frontIndex > lastIndex;
 		}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
index 85f3fe9cb..5c42bf2d4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/SkillController.java
@@ -55,10 +55,10 @@ public final class SkillController {
 			}
 		}*/
 	}
-	
+
 	public static int getDropChanceRollBias(DropItem item, Player player) {
 		if (player == null) return 0;
-		
+
 		if (ItemTypeCollection.isGoldItemType(item.itemType.id)) {
 			return getRollBias(item, player, SkillID.coinfinder, SkillCollection.PER_SKILLPOINT_INCREASE_COINFINDER_CHANCE_PERCENT);
 		} else if (!item.itemType.isOrdinaryItem()) {
@@ -67,25 +67,25 @@ public final class SkillController {
 			return 0;
 		}
 	}
-	
+
 	public static int getDropQuantityRollBias(DropItem item, Player player) {
 		if (player == null) return 0;
 		if (!ItemTypeCollection.isGoldItemType(item.itemType.id)) return 0;
-		
+
 		return getRollBias(item, player, SkillID.coinfinder, SkillCollection.PER_SKILLPOINT_INCREASE_COINFINDER_QUANTITY_PERCENT);
 	}
-	
+
 	private static int getRollBias(DropItem item, Player player, SkillID skill, int perSkillpointIncrease) {
 		return getRollBias(item.chance, player, skill, perSkillpointIncrease);
 	}
-	
+
 	private static int getRollBias(ConstRange chance, Player player, SkillID skill, int perSkillpointIncrease) {
 		int skillLevel = player.getSkillLevel(skill);
 		if (skillLevel <= 0) return 0;
 		return chance.current * skillLevel * perSkillpointIncrease / 100;
 	}
-	
-	
+
+
 	private static boolean canLevelupSkillWithQuest(Player player, SkillInfo skill) {
 		final int playerSkillLevel = player.getSkillLevel(skill.id);
 		if (skill.hasMaxLevel()) {
@@ -119,16 +119,16 @@ public final class SkillController {
 		player.addSkillLevel(skillID);
 		controllers.actorStatsController.recalculatePlayerStats(player);
 	}
-	
+
 	public static int getActorConditionEffectChanceRollBias(ActorConditionEffect effect, Player player) {
 		if (effect.chance.isMax()) return 0;
-		
+
 		int result = 0;
 		result += getActorConditionEffectChanceRollBiasFromResistanceSkills(effect, player);
 		result += getActorConditionEffectChanceRollBias(effect, player, SkillID.shadowBless, SkillCollection.PER_SKILLPOINT_INCREASE_RESISTANCE_SHADOW_BLESS);
 		return result;
 	}
-	
+
 	private static int getActorConditionEffectChanceRollBiasFromResistanceSkills(ActorConditionEffect effect, Player player) {
 		SkillID skill;
 		switch (effect.conditionType.conditionCategory) {
@@ -141,15 +141,15 @@ public final class SkillController {
 		default:
 			return 0;
 		}
-		
+
 		return getActorConditionEffectChanceRollBias(effect, player, skill, SkillCollection.PER_SKILLPOINT_INCREASE_RESISTANCE_CHANCE_PERCENT);
 	}
-	
+
 	private static int getActorConditionEffectChanceRollBias(ActorConditionEffect effect, Player player, SkillID skill, int chanceIncreasePerSkillLevel) {
 		// Note that the bias should be negative, making it less likely that the chance roll will succeed
 		return getRollBias(effect.chance, player, skill, -chanceIncreasePerSkillLevel);
 	}
-	
+
 	public static boolean rollForSkillChance(Player player, SkillID skill, int chancePerSkillLevel) {
 		int skillLevel = player.getSkillLevel(skill);
 		if (skillLevel <= 0) return false;
@@ -160,29 +160,29 @@ public final class SkillController {
 		ActorConditionEffect effect = new ActorConditionEffect(conditionType, magnitude, duration, null);
 		controllers.actorStatsController.applyActorCondition(target, effect);
 	}
-			
+
 	public void applySkillEffectsFromPlayerAttack(AttackResult result, Monster monster) {
 		if (!result.isHit) return;
-		
+
 		Player player = world.model.player;
-		
+
 		if (player.getAttackChance() - monster.getBlockChance() > SkillCollection.CONCUSSION_THRESHOLD) {
 			if (rollForSkillChance(player, SkillID.concussion, SkillCollection.PER_SKILLPOINT_INCREASE_CONCUSSION_CHANCE)) {
 				addConditionToActor(monster, "concussion", 1, 5);
 			}
 		}
-		
+
 		if (result.isCriticalHit) {
 			if (rollForSkillChance(player, SkillID.crit2, SkillCollection.PER_SKILLPOINT_INCREASE_CRIT2_CHANCE)) {
 				addConditionToActor(monster, "crit2", 1, 5);
 			}
-			
+
 			if (rollForSkillChance(player, SkillID.crit1, SkillCollection.PER_SKILLPOINT_INCREASE_CRIT1_CHANCE)) {
 				addConditionToActor(monster, "crit1", 1, 5);
 			}
 		}
 	}
-	
+
 	public void applySkillEffectsFromMonsterAttack(AttackResult result, Monster monster) {
 		if (!result.isHit) {
 			if (rollForSkillChance(world.model.player, SkillID.taunt, SkillCollection.PER_SKILLPOINT_INCREASE_TAUNT_CHANCE)) {
@@ -193,7 +193,7 @@ public final class SkillController {
 
 	public static void applySkillEffectsFromItemProficiencies(Player player) {
 		Player playerTraits = player;
-		
+
 		ItemType mainWeapon = ItemController.getMainWeapon(player);
 		if (mainWeapon != null) {
 			final int skillLevel = getSkillLevelForItemType(player, mainWeapon);
@@ -201,7 +201,7 @@ public final class SkillController {
 			addPercentBlockChance(player, mainWeapon, SkillCollection.PER_SKILLPOINT_INCREASE_WEAPON_PROF_BC_PERCENT * skillLevel, 0);
 			addPercentCriticalSkill(player, mainWeapon, SkillCollection.PER_SKILLPOINT_INCREASE_WEAPON_PROF_CS_PERCENT * skillLevel, 0);
 		}
-		
+
 		final int unarmedLevel = player.getSkillLevel(SkillID.weaponProficiencyUnarmed);
 		if (unarmedLevel > 0) {
 			if (isUnarmed(player)) {
@@ -211,28 +211,28 @@ public final class SkillController {
 				playerTraits.blockChance += SkillCollection.PER_SKILLPOINT_INCREASE_UNARMED_BC * unarmedLevel;
 			}
 		}
-		
+
 		ItemType shield = player.inventory.getItemTypeInWearSlot(Inventory.WearSlot.shield);
 		if (shield != null && shield.isShield()) {
 			playerTraits.damageResistance += SkillCollection.PER_SKILLPOINT_INCREASE_SHIELD_PROF_DR * getSkillLevelForItemType(player, shield);
 		}
-		
+
 		final int unarmoredLevel = player.getSkillLevel(SkillID.armorProficiencyUnarmored);
 		if (unarmoredLevel > 0) {
 			if (isUnarmored(player)) {
 				playerTraits.blockChance += SkillCollection.PER_SKILLPOINT_INCREASE_UNARMORED_BC * unarmoredLevel;
 			}
 		}
-		
+
 		int skillLevelLightArmor = player.getSkillLevel(SkillID.armorProficiencyLight);
 		int skillLevelHeavyArmor = player.getSkillLevel(SkillID.armorProficiencyHeavy);
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
 			if (!Inventory.isArmorSlot(slot)) continue;
-			
+
 			ItemType itemType = player.inventory.getItemTypeInWearSlot(slot);
 			if (itemType == null) continue;
 			if (itemType.effects_equip == null) continue;
-			
+
 			SkillID skill = getProficiencySkillForItemCategory(itemType.category);
 			if (skill == SkillID.armorProficiencyLight) {
 				if (skillLevelLightArmor > 0) {
@@ -247,7 +247,7 @@ public final class SkillController {
 			}
 		}
 	}
-	
+
 	private static boolean isUnarmed(Player player) {
 		if (hasItemWithWeight(player, Inventory.WearSlot.weapon)) return false;
 		if (hasItemWithWeight(player, Inventory.WearSlot.shield)) return false;
@@ -272,22 +272,22 @@ public final class SkillController {
 		if (skill == null) return 0;
 		return player.getSkillLevel(skill);
 	}
-	
+
 	public static SkillID getProficiencySkillForItemCategory(ItemCategory category) {
 		final String itemCategoryID = category.id;
 		if (category.isWeapon()) {
-			if (itemCategoryID.equals("dagger") || itemCategoryID.equals("ssword")) 
+			if (itemCategoryID.equals("dagger") || itemCategoryID.equals("ssword"))
 				return SkillID.weaponProficiencyDagger;
 			else if (itemCategoryID.equals("lsword") || itemCategoryID.equals("bsword") || itemCategoryID.equals("rapier"))
 				return SkillID.weaponProficiency1hsword;
-			else if (itemCategoryID.equals("2hsword")) 
+			else if (itemCategoryID.equals("2hsword"))
 				return SkillID.weaponProficiency2hsword;
-			else if (itemCategoryID.equals("axe") || itemCategoryID.equals("axe2h")) 
+			else if (itemCategoryID.equals("axe") || itemCategoryID.equals("axe2h"))
 				return SkillID.weaponProficiencyAxe;
 			else if (itemCategoryID.equals("club") || itemCategoryID.equals("staff") || itemCategoryID.equals("mace")
 					|| itemCategoryID.equals("scepter") || itemCategoryID.equals("hammer") || itemCategoryID.equals("hammer2h"))
 				return SkillID.weaponProficiencyBlunt;
-		} else if (category.isShield()) { 
+		} else if (category.isShield()) {
 			return SkillID.armorProficiencyShield;
 		} else if (category.isArmor()) {
 			ItemCategory.ItemCategorySize size = category.getSize();
@@ -302,7 +302,7 @@ public final class SkillController {
 		Player playerTraits = player;
 		ItemType mainHandItem = player.inventory.getItemTypeInWearSlot(Inventory.WearSlot.weapon);
 		ItemType offHandItem = player.inventory.getItemTypeInWearSlot(Inventory.WearSlot.shield);
-		
+
 		if (isWielding2HandItem(mainHandItem, offHandItem)) {
 			int skillLevelFightStyle = player.getSkillLevel(SkillID.fightstyle2hand);
 			int skillLevelSpecialization = player.getSkillLevel(SkillID.specialization2hand);
@@ -310,7 +310,7 @@ public final class SkillController {
 			addPercentDamage(playerTraits, mainHandItem, skillLevelSpecialization * SkillCollection.PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_DMG_PERCENT, 0);
 			addPercentAttackChance(playerTraits, mainHandItem, skillLevelSpecialization * SkillCollection.PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_AC_PERCENT, 0);
 		}
-		
+
 		if (isWieldingWeaponAndShield(mainHandItem, offHandItem)) {
 			int skillLevelFightStyle = player.getSkillLevel(SkillID.fightstyleWeaponShield);
 			int skillLevelSpecialization = player.getSkillLevel(SkillID.specializationWeaponShield);
@@ -319,7 +319,7 @@ public final class SkillController {
 			addPercentAttackChance(playerTraits, mainHandItem, skillLevelSpecialization * SkillCollection.PER_SKILLPOINT_INCREASE_SPECIALIZATION_WEAPON_AC_PERCENT, 0);
 			addPercentDamage(playerTraits, mainHandItem, skillLevelSpecialization * SkillCollection.PER_SKILLPOINT_INCREASE_SPECIALIZATION_WEAPON_DMG_PERCENT, 0);
 		}
-		
+
 		if (isDualWielding(mainHandItem, offHandItem)) {
 			int skillLevelFightStyle = player.getSkillLevel(SkillID.fightstyleDualWield);
 			if (offHandItem.effects_equip != null) {
@@ -347,7 +347,7 @@ public final class SkillController {
 				addPercentDamage(player, offHandItem, percent, 100);
 				addPercentCriticalSkill(player, offHandItem, percent, 100);
 			}
-			
+
 			int skillLevelSpecialization = player.getSkillLevel(SkillID.specializationDualWield);
 			addPercentAttackChance(playerTraits, mainHandItem, skillLevelSpecialization * SkillCollection.PER_SKILLPOINT_INCREASE_SPECIALIZATION_DUALWIELD_AC_PERCENT, 0);
 			addPercentBlockChance(playerTraits, mainHandItem, skillLevelSpecialization * SkillCollection.PER_SKILLPOINT_INCREASE_SPECIALIZATION_DUALWIELD_BC_PERCENT, 0);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
index 15e74f421..bff5fb753 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java
@@ -24,9 +24,9 @@ public final class VisualEffectController {
 	private final ControllerContext controllers;
 	private final WorldContext world;
 	private final VisualEffectCollection effectTypes;
-	
+
 	public final VisualEffectFrameListeners visualEffectFrameListeners = new VisualEffectFrameListeners();
-	
+
 	public VisualEffectController(ControllerContext controllers, WorldContext world) {
 		this.controllers = controllers;
 		this.world = world;
@@ -67,34 +67,34 @@ public final class VisualEffectController {
 				postDelayed(this, effect.millisecondPerFrame);
 			}
 		}
-	      
-	    private void update() {
-        	++currentFrame;
-        	int frame = currentFrame;
-        	
-    		int tileID = effect.frameIconIDs[frame];
+
+		private void update() {
+			++currentFrame;
+			int frame = currentFrame;
+
+			int tileID = effect.frameIconIDs[frame];
 			int textYOffset = -2 * (frame);
 			if (frame >= beginFadeAtFrame && displayText != null) {
-				this.textPaint.setAlpha(255 * (effect.lastFrame - frame) / (effect.lastFrame - beginFadeAtFrame)); 
+				this.textPaint.setAlpha(255 * (effect.lastFrame - frame) / (effect.lastFrame - beginFadeAtFrame));
 			}
 			area.topLeft.y = position.y - 1;
 			visualEffectFrameListeners.onNewAnimationFrame(this, tileID, textYOffset);
 		}
 
 		private void onCompleted() {
-    		--effectCount;
-    		visualEffectFrameListeners.onAnimationCompleted(this);
+			--effectCount;
+			visualEffectFrameListeners.onAnimationCompleted(this);
 			if (callback != null) callback.onVisualEffectCompleted(callbackValue);
 		}
-		
+
 		public void start() {
 			postDelayed(this, 0);
 		}
 
 		private int currentFrame = 0;
-		
+
 		private final VisualEffect effect;
-		
+
 		public final Coord position;
 		public final String displayText;
 		public final CoordRect area;
@@ -102,7 +102,7 @@ public final class VisualEffectController {
 		private final int beginFadeAtFrame;
 		private final VisualEffectCompletedCallback callback;
 		private final int callbackValue;
-		
+
 		public VisualEffectAnimation(VisualEffect effect, Coord position, int displayValue, VisualEffectCompletedCallback callback, int callbackValue) {
 			this.position = position;
 			this.callback = callback;
@@ -118,7 +118,7 @@ public final class VisualEffectController {
 			this.beginFadeAtFrame = effect.lastFrame / 2;
 		}
 	}
-	
+
 	public static interface VisualEffectCompletedCallback {
 		public void onVisualEffectCompleted(int callbackValue);
 	}
@@ -126,7 +126,7 @@ public final class VisualEffectController {
 	public boolean isRunningVisualEffect() {
 		return effectCount > 0;
 	}
-	
+
 
 	public static final class BloodSplatter {
 		public final long removeAfter;
@@ -142,7 +142,7 @@ public final class VisualEffectController {
 			reduceIconAfter = now + Constants.SPLATTER_DURATION_MS / 2;
 		}
 	}
-	
+
 	public void updateSplatters(PredefinedMap map) {
 		long now = System.currentTimeMillis();
 		for (int i = map.splatters.size() - 1; i >= 0; --i) {
@@ -157,7 +157,7 @@ public final class VisualEffectController {
 			}
 		}
 	}
-	
+
 	public void addSplatter(PredefinedMap map, Monster m) {
 		int iconID = getSplatterIconFromMonsterClass(m.getMonsterClass());
 		if (iconID > 0) {
@@ -165,7 +165,7 @@ public final class VisualEffectController {
 			controllers.monsterSpawnController.monsterSpawnListeners.onSplatterAdded(map, m.position);
 		}
 	}
-	
+
 	private static int getSplatterIconFromMonsterClass(MonsterType.MonsterClass monsterClass) {
 		switch (monsterClass) {
 		case insect:
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
index 1b4a51221..686416355 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java
@@ -33,7 +33,7 @@ import com.gpl.rpg.AndorsTrail.util.Size;
 public final class WorldMapController {
 
 	private static final int WORLDMAP_SCREENSHOT_TILESIZE = 8;
-    public static final int WORLDMAP_DISPLAY_TILESIZE = WORLDMAP_SCREENSHOT_TILESIZE;
+	public static final int WORLDMAP_DISPLAY_TILESIZE = WORLDMAP_SCREENSHOT_TILESIZE;
 
 	public static void updateWorldMap(final WorldContext world, final Resources res) {
 		updateWorldMap(world, world.model.currentMap, world.model.currentTileMap, world.tileManager.currentMapTiles, res);
@@ -50,7 +50,7 @@ public final class WorldMapController {
 
 		if (!shouldUpdateWorldMap(map, worldMapSegmentName, world.maps.worldMapRequiresUpdate)) return;
 
-		(new AsyncTask<Void, Void, Void>()  {
+		(new AsyncTask<Void, Void, Void>() {
 			@Override
 			protected Void doInBackground(Void... arg0) {
 				final MapRenderer renderer = new MapRenderer(world, map, mapTiles, cachedTiles);
@@ -68,13 +68,13 @@ public final class WorldMapController {
 			}
 		}).execute();
 	}
-	
+
 	private static boolean shouldUpdateWorldMap(PredefinedMap map, String worldMapSegmentName, boolean forceUpdate) {
 		if (forceUpdate) return true;
 		if (!map.visited) return true;
 		File file = getFileForMap(map, false);
 		if (!file.exists()) return true;
-		
+
 		file = getCombinedWorldMapFile(worldMapSegmentName);
 		if (!file.exists()) return true;
 
@@ -83,16 +83,16 @@ public final class WorldMapController {
 
 	private static void updateCachedBitmap(PredefinedMap map, MapRenderer renderer) throws IOException {
 		ensureWorldmapDirectoryExists();
-    	
+
 		File file = getFileForMap(map, false);
-    	if (file.exists()) return;
-		
+		if (file.exists()) return;
+
 		Bitmap image = renderer.drawMap();
 		FileOutputStream fos = new FileOutputStream(file);
-    	image.compress(Bitmap.CompressFormat.PNG, 70, fos);
-        fos.flush();
-        fos.close();
-        image.recycle();
+		image.compress(Bitmap.CompressFormat.PNG, 70, fos);
+		fos.flush();
+		fos.close();
+		image.recycle();
 		L.log("WorldMapController: Wrote " + file.getAbsolutePath());
 	}
 
@@ -103,7 +103,7 @@ public final class WorldMapController {
 		private final int tileSize;
 		private final float scale;
 		private final Paint mPaint = new Paint();
-		
+
 		public MapRenderer(final WorldContext world, final PredefinedMap map, final LayeredTileMap mapTiles, final TileCollection cachedTiles) {
 			this.map = map;
 			this.mapTiles = mapTiles;
@@ -112,7 +112,7 @@ public final class WorldMapController {
 			this.scale = (float) WORLDMAP_SCREENSHOT_TILESIZE / world.tileManager.tileSize;
 			mapTiles.setColorFilter(mPaint);
 		}
-		
+
 		public Bitmap drawMap() {
 			Bitmap image = Bitmap.createBitmap(map.size.width * WORLDMAP_SCREENSHOT_TILESIZE, map.size.height * WORLDMAP_SCREENSHOT_TILESIZE, Config.RGB_565);
 			image.setDensity(Bitmap.DENSITY_NONE);
@@ -121,31 +121,31 @@ public final class WorldMapController {
 
 			synchronized (cachedTiles) {
 				drawMapLayer(canvas, mapTiles.currentLayout.layerGround);
-		        tryDrawMapLayer(canvas, mapTiles.currentLayout.layerObjects);
-		        tryDrawMapLayer(canvas, mapTiles.currentLayout.layerAbove);
+				tryDrawMapLayer(canvas, mapTiles.currentLayout.layerObjects);
+				tryDrawMapLayer(canvas, mapTiles.currentLayout.layerAbove);
 			}
-	        return image;
+			return image;
 		}
 
 		private void tryDrawMapLayer(Canvas canvas, final MapLayer layer) {
 			if (layer != null) drawMapLayer(canvas, layer);
-	    }
-	    
-	    private void drawMapLayer(Canvas canvas, final MapLayer layer) {
-	    	int py = 0;
+		}
+
+		private void drawMapLayer(Canvas canvas, final MapLayer layer) {
+			int py = 0;
 			for (int y = 0; y < map.size.height; ++y, py += tileSize) {
-	        	int px = 0;
-	        	for (int x = 0; x < map.size.width; ++x, px += tileSize) {
-	        		final int tile = layer.tiles[x][y];
-	        		if (tile == 0) continue;
-	        		cachedTiles.drawTile(canvas, tile, px, py, mPaint);
-	            }
-	        }
-	    }
+				int px = 0;
+				for (int x = 0; x < map.size.width; ++x, px += tileSize) {
+					final int tile = layer.tiles[x][y];
+					if (tile == 0) continue;
+					cachedTiles.drawTile(canvas, tile, px, py, mPaint);
+				}
+			}
+		}
 	}
-	
-    private static void ensureWorldmapDirectoryExists() throws IOException {
-    	File root = Environment.getExternalStorageDirectory();
+
+	private static void ensureWorldmapDirectoryExists() throws IOException {
+		File root = Environment.getExternalStorageDirectory();
 		File dir = new File(root, Constants.FILENAME_SAVEGAME_DIRECTORY);
 		if (!dir.exists()) dir.mkdir();
 		dir = new File(dir, Constants.FILENAME_WORLDMAP_DIRECTORY);
@@ -153,8 +153,8 @@ public final class WorldMapController {
 
 		File noMediaFile = new File(dir, ".nomedia");
 		if (!noMediaFile.exists()) noMediaFile.createNewFile();
-    }
-    private static File getFileForMap(PredefinedMap map, boolean verifyFileExists) {
+	}
+	private static File getFileForMap(PredefinedMap map, boolean verifyFileExists) {
 		if (map.lastSeenLayoutHash.length() > 0) {
 			File fileWithHash = getPngFile(map.name + "." + map.lastSeenLayoutHash);
 			if (!verifyFileExists) return fileWithHash;
@@ -162,21 +162,21 @@ public final class WorldMapController {
 		}
 		return getPngFile(map.name);
 	}
-    private static File getPngFile(String fileName) {
-    	return new File(getWorldmapDirectory(), fileName + ".png");
-    }
-    private static File getWorldmapDirectory() {
-    	File dir = Environment.getExternalStorageDirectory();
-    	dir = new File(dir, Constants.FILENAME_SAVEGAME_DIRECTORY);
-    	return new File(dir, Constants.FILENAME_WORLDMAP_DIRECTORY);
-    }
-    public static File getCombinedWorldMapFile(String segmentName) {
-    	return new File(getWorldmapDirectory(), Constants.FILENAME_WORLDMAP_HTMLFILE_PREFIX + segmentName + Constants.FILENAME_WORLDMAP_HTMLFILE_SUFFIX);
-    }
-	
+	private static File getPngFile(String fileName) {
+		return new File(getWorldmapDirectory(), fileName + ".png");
+	}
+	private static File getWorldmapDirectory() {
+		File dir = Environment.getExternalStorageDirectory();
+		dir = new File(dir, Constants.FILENAME_SAVEGAME_DIRECTORY);
+		return new File(dir, Constants.FILENAME_WORLDMAP_DIRECTORY);
+	}
+	public static File getCombinedWorldMapFile(String segmentName) {
+		return new File(getWorldmapDirectory(), Constants.FILENAME_WORLDMAP_HTMLFILE_PREFIX + segmentName + Constants.FILENAME_WORLDMAP_HTMLFILE_SUFFIX);
+	}
+
 	private static String getWorldMapSegmentAsHtml(Resources res, WorldContext world, String segmentName) {
 		WorldMapSegment segment = world.maps.worldMapSegments.get(segmentName);
-		
+
 		Map<String, File> displayedMapFilenamesPerMapName = new HashMap<String, File>(segment.maps.size());
 		Coord offsetWorldmapTo = new Coord(999999, 999999);
 		for (WorldMapSegmentMap map : segment.maps.values()) {
@@ -186,18 +186,18 @@ public final class WorldMapController {
 			File f = WorldMapController.getFileForMap(predefinedMap, true);
 			if (!f.exists()) continue;
 			displayedMapFilenamesPerMapName.put(map.mapName, f);
-			
+
 			offsetWorldmapTo.x = Math.min(offsetWorldmapTo.x, map.worldPosition.x);
 			offsetWorldmapTo.y = Math.min(offsetWorldmapTo.y, map.worldPosition.y);
 		}
-		
+
 		Coord bottomRight = new Coord(0, 0);
 
 		StringBuilder mapsAsHtml = new StringBuilder(1000);
 		for (WorldMapSegmentMap segmentMap : segment.maps.values()) {
 			File f = displayedMapFilenamesPerMapName.get(segmentMap.mapName);
 			if (f == null) continue;
-			
+
 			Size size = getMapSize(segmentMap, world);
 			mapsAsHtml
 				.append("<img src=\"")
@@ -214,7 +214,7 @@ public final class WorldMapController {
 				.append((segmentMap.worldPosition.y - offsetWorldmapTo.y) * WorldMapController.WORLDMAP_DISPLAY_TILESIZE)
 				.append("px;\" />");
 			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) mapsAsHtml.append('\n');
-			
+
 			bottomRight.x = Math.max(bottomRight.x, segmentMap.worldPosition.x + size.width);
 			bottomRight.y = Math.max(bottomRight.y, segmentMap.worldPosition.y + size.height);
 		}
@@ -243,7 +243,7 @@ public final class WorldMapController {
 				.append("</span></div>");
 			if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) namedAreasAsHtml.append('\n');
 		}
-		
+
 		return res.getString(R.string.worldmap_template)
 				.replace("{{maps}}", mapsAsHtml.toString())
 				.replace("{{areas}}", namedAreasAsHtml.toString())
@@ -252,15 +252,15 @@ public final class WorldMapController {
 				.replace("{{offsetx}}", Integer.toString(offsetWorldmapTo.x * WorldMapController.WORLDMAP_DISPLAY_TILESIZE))
 				.replace("{{offsety}}", Integer.toString(offsetWorldmapTo.y * WorldMapController.WORLDMAP_DISPLAY_TILESIZE));
 	}
-	
+
 	private static Size getMapSize(WorldMapSegmentMap map, WorldContext world) {
 		return world.maps.findPredefinedMap(map.mapName).size;
 	}
-	
+
 	private static CoordRect determineNamedAreaBoundary(NamedWorldMapArea area, WorldMapSegment segment, WorldContext world, Set<String> displayedMapNames) {
 		Coord topLeft = null;
 		Coord bottomRight = null;
-		
+
 		for (String mapName : area.mapNames) {
 			if (!displayedMapNames.contains(mapName)) continue;
 			WorldMapSegmentMap map = segment.maps.get(mapName);
@@ -296,7 +296,7 @@ public final class WorldMapController {
 			Toast.makeText(context, context.getResources().getString(R.string.display_worldmap_not_available), Toast.LENGTH_LONG).show();
 			return false;
 		}
-		
+
 		Intent intent = new Intent(context, DisplayWorldMapActivity.class);
 		intent.putExtra("worldMapSegmentName", worldMapSegmentName);
 		context.startActivity(intent);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java
index 8fb4e1a8c..ae8840f81 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListener.java
@@ -8,7 +8,7 @@ public interface CombatActionListener {
 	void onPlayerAttackSuccess(Monster target, AttackResult attackResult);
 	void onMonsterAttackMissed(Monster attacker, AttackResult attackResult);
 	void onMonsterAttackSuccess(Monster attacker, AttackResult attackResult);
-    void onMonsterMovedDuringCombat(Monster m);
+	void onMonsterMovedDuringCombat(Monster m);
 	void onPlayerKilledMonster(Monster target);
 	void onPlayerStartedFleeing();
 	void onPlayerFailedFleeing();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java
index 464655646..d823ec2b5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatActionListeners.java
@@ -9,35 +9,35 @@ public final class CombatActionListeners extends ListOfListeners<CombatActionLis
 	private final Function2<CombatActionListener, Monster, AttackResult> onPlayerAttackMissed = new Function2<CombatActionListener, Monster, AttackResult>() {
 		@Override public void call(CombatActionListener listener, Monster target, AttackResult attackResult) { listener.onPlayerAttackMissed(target, attackResult); }
 	};
-	
+
 	private final Function2<CombatActionListener, Monster, AttackResult> onPlayerAttackSuccess = new Function2<CombatActionListener, Monster, AttackResult>() {
 		@Override public void call(CombatActionListener listener, Monster target, AttackResult attackResult) { listener.onPlayerAttackSuccess(target, attackResult); }
 	};
-	
+
 	private final Function2<CombatActionListener, Monster, AttackResult> onMonsterAttackMissed = new Function2<CombatActionListener, Monster, AttackResult>() {
 		@Override public void call(CombatActionListener listener, Monster attacker, AttackResult attackResult) { listener.onMonsterAttackMissed(attacker, attackResult); }
 	};
-	
+
 	private final Function2<CombatActionListener, Monster, AttackResult> onMonsterAttackSuccess = new Function2<CombatActionListener, Monster, AttackResult>() {
 		@Override public void call(CombatActionListener listener, Monster attacker, AttackResult attackResult) { listener.onMonsterAttackSuccess(attacker, attackResult); }
 	};
 
-    private final Function1<CombatActionListener, Monster> onMonsterMovedDuringCombat = new Function1<CombatActionListener, Monster>() {
-        @Override public void call(CombatActionListener listener, Monster m) { listener.onMonsterMovedDuringCombat(m); }
-    };
+	private final Function1<CombatActionListener, Monster> onMonsterMovedDuringCombat = new Function1<CombatActionListener, Monster>() {
+		@Override public void call(CombatActionListener listener, Monster m) { listener.onMonsterMovedDuringCombat(m); }
+	};
 
-    private final Function1<CombatActionListener, Monster> onPlayerKilledMonster = new Function1<CombatActionListener, Monster>() {
+	private final Function1<CombatActionListener, Monster> onPlayerKilledMonster = new Function1<CombatActionListener, Monster>() {
 		@Override public void call(CombatActionListener listener, Monster target) { listener.onPlayerKilledMonster(target); }
 	};
-	
+
 	private final Function<CombatActionListener> onPlayerStartedFleeing = new Function<CombatActionListener>() {
 		@Override public void call(CombatActionListener listener) { listener.onPlayerStartedFleeing(); }
 	};
-	
+
 	private final Function<CombatActionListener> onPlayerFailedFleeing = new Function<CombatActionListener>() {
 		@Override public void call(CombatActionListener listener) { listener.onPlayerFailedFleeing(); }
 	};
-	
+
 	private final Function<CombatActionListener> onPlayerDoesNotHaveEnoughAP = new Function<CombatActionListener>() {
 		@Override public void call(CombatActionListener listener) { listener.onPlayerDoesNotHaveEnoughAP(); }
 	};
@@ -62,10 +62,10 @@ public final class CombatActionListeners extends ListOfListeners<CombatActionLis
 		callAllListeners(this.onMonsterAttackSuccess, attacker, attackResult);
 	}
 
-    @Override
-    public void onMonsterMovedDuringCombat(Monster m) {
-        callAllListeners(this.onMonsterMovedDuringCombat, m);
-    }
+	@Override
+	public void onMonsterMovedDuringCombat(Monster m) {
+		callAllListeners(this.onMonsterMovedDuringCombat, m);
+	}
 
 	@Override
 	public void onPlayerKilledMonster(Monster target) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java
index caf2574e2..d634b1ee1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatSelectionListeners.java
@@ -9,20 +9,20 @@ public final class CombatSelectionListeners extends ListOfListeners<CombatSelect
 	private final Function3<CombatSelectionListener, Monster, Coord, Coord> onMonsterSelected = new Function3<CombatSelectionListener, Monster, Coord, Coord>() {
 		@Override public void call(CombatSelectionListener listener, Monster monster, Coord selectedPosition, Coord previousSelection) { listener.onMonsterSelected(monster, selectedPosition, previousSelection); }
 	};
-	
+
 	private final Function2<CombatSelectionListener, Coord, Coord> onMovementDestinationSelected = new Function2<CombatSelectionListener, Coord, Coord>() {
 		@Override public void call(CombatSelectionListener listener, Coord selectedPosition, Coord previousSelection) { listener.onMovementDestinationSelected(selectedPosition, previousSelection); }
 	};
-	
+
 	private final Function1<CombatSelectionListener, Coord> onCombatSelectionCleared = new Function1<CombatSelectionListener, Coord>() {
 		@Override public void call(CombatSelectionListener listener, Coord previousSelection) { listener.onCombatSelectionCleared(previousSelection); }
 	};
-	
+
 	@Override
 	public void onMonsterSelected(Monster m, Coord selectedPosition, Coord previousSelection) {
 		callAllListeners(this.onMonsterSelected, m, selectedPosition, previousSelection);
 	}
-	
+
 	@Override
 	public void onMovementDestinationSelected(Coord selectedPosition, Coord previousSelection) {
 		callAllListeners(this.onMovementDestinationSelected, selectedPosition, previousSelection);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListeners.java
index 91f8f84df..a836fdfe8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/CombatTurnListeners.java
@@ -4,23 +4,23 @@ import com.gpl.rpg.AndorsTrail.model.actor.Monster;
 import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class CombatTurnListeners extends ListOfListeners<CombatTurnListener> implements CombatTurnListener {
-	
+
 	private final Function<CombatTurnListener> onCombatStarted = new Function<CombatTurnListener>() {
 		@Override public void call(CombatTurnListener listener) { listener.onCombatStarted(); }
 	};
-	
+
 	private final Function<CombatTurnListener> onCombatEnded = new Function<CombatTurnListener>() {
 		@Override public void call(CombatTurnListener listener) { listener.onCombatEnded(); }
 	};
-	
+
 	private final Function<CombatTurnListener> onNewPlayerTurn = new Function<CombatTurnListener>() {
 		@Override public void call(CombatTurnListener listener) { listener.onNewPlayerTurn(); }
 	};
-	
+
 	private final Function1<CombatTurnListener, Monster> onMonsterIsAttacking = new Function1<CombatTurnListener, Monster>() {
 		@Override public void call(CombatTurnListener listener, Monster m) { listener.onMonsterIsAttacking(m); }
 	};
-	
+
 	@Override
 	public void onCombatStarted() {
 		callAllListeners(this.onCombatStarted);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListeners.java
index 3804a479a..8a1d777c4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/GameRoundListeners.java
@@ -3,15 +3,15 @@ package com.gpl.rpg.AndorsTrail.controller.listeners;
 import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class GameRoundListeners extends ListOfListeners<GameRoundListener> implements GameRoundListener {
-	
+
 	private final Function<GameRoundListener> onNewTick = new Function<GameRoundListener>() {
 		@Override public void call(GameRoundListener listener) { listener.onNewTick(); }
 	};
-	
+
 	private final Function<GameRoundListener> onNewRound = new Function<GameRoundListener>() {
 		@Override public void call(GameRoundListener listener) { listener.onNewRound(); }
 	};
-	
+
 	private final Function<GameRoundListener> onNewFullRound = new Function<GameRoundListener>() {
 		@Override public void call(GameRoundListener listener) { listener.onNewFullRound(); }
 	};
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java
index a7259b1fa..c86c9cdbd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterMovementListeners.java
@@ -10,16 +10,16 @@ public final class MonsterMovementListeners extends ListOfListeners<MonsterMovem
 	private final Function1<MonsterMovementListener, Monster> onMonsterSteppedOnPlayer = new Function1<MonsterMovementListener, Monster>() {
 		@Override public void call(MonsterMovementListener listener, Monster monster) { listener.onMonsterSteppedOnPlayer(monster); }
 	};
-	
+
 	private final Function3<MonsterMovementListener, PredefinedMap, Monster, CoordRect> onMonsterMoved = new Function3<MonsterMovementListener, PredefinedMap, Monster, CoordRect>() {
 		@Override public void call(MonsterMovementListener listener, PredefinedMap map, Monster monster, CoordRect previousPosition) { listener.onMonsterMoved(map, monster, previousPosition); }
 	};
-	
+
 	@Override
 	public void onMonsterSteppedOnPlayer(Monster m) {
 		callAllListeners(this.onMonsterSteppedOnPlayer, m);
 	}
-	
+
 	@Override
 	public void onMonsterMoved(PredefinedMap map, Monster m, CoordRect previousPosition) {
 		callAllListeners(this.onMonsterMoved, map, m, previousPosition);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java
index 0c15ca3f5..b305c3b8e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/MonsterSpawnListeners.java
@@ -11,23 +11,23 @@ public final class MonsterSpawnListeners extends ListOfListeners<MonsterSpawnLis
 	private final Function2<MonsterSpawnListener, PredefinedMap, Monster> onMonsterSpawned = new Function2<MonsterSpawnListener, PredefinedMap, Monster>() {
 		@Override public void call(MonsterSpawnListener listener, PredefinedMap map, Monster monster) { listener.onMonsterSpawned(map, monster); }
 	};
-	
+
 	private final Function3<MonsterSpawnListener, PredefinedMap, Monster, CoordRect> onMonsterRemoved = new Function3<MonsterSpawnListener, PredefinedMap, Monster, CoordRect>() {
 		@Override public void call(MonsterSpawnListener listener, PredefinedMap map, Monster monster, CoordRect previousPosition) { listener.onMonsterRemoved(map, monster, previousPosition); }
 	};
-	
+
 	private final Function2<MonsterSpawnListener, PredefinedMap, Coord> onSplatterAdded = new Function2<MonsterSpawnListener, PredefinedMap, Coord>() {
 		@Override public void call(MonsterSpawnListener listener, PredefinedMap map, Coord p) { listener.onSplatterAdded(map, p); }
 	};
-	
+
 	private final Function2<MonsterSpawnListener, PredefinedMap, Coord> onSplatterChanged = new Function2<MonsterSpawnListener, PredefinedMap, Coord>() {
 		@Override public void call(MonsterSpawnListener listener, PredefinedMap map, Coord p) { listener.onSplatterChanged(map, p); }
 	};
-	
+
 	private final Function2<MonsterSpawnListener, PredefinedMap, Coord> onSplatterRemoved = new Function2<MonsterSpawnListener, PredefinedMap, Coord>() {
 		@Override public void call(MonsterSpawnListener listener, PredefinedMap map, Coord p) { listener.onSplatterRemoved(map, p); }
 	};
-	
+
 	@Override
 	public void onMonsterSpawned(PredefinedMap map, Monster m) {
 		callAllListeners(this.onMonsterSpawned, map, m);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java
index 3a03dc34e..29e7f353e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/PlayerMovementListeners.java
@@ -9,16 +9,16 @@ public final class PlayerMovementListeners extends ListOfListeners<PlayerMovemen
 	private final Function2<PlayerMovementListener, Coord, Coord> onPlayerMoved = new Function2<PlayerMovementListener, Coord, Coord>() {
 		@Override public void call(PlayerMovementListener listener, Coord newPosition, Coord previousPosition) { listener.onPlayerMoved(newPosition, previousPosition); }
 	};
-	
+
 	private final Function2<PlayerMovementListener, PredefinedMap, Coord> onPlayerEnteredNewMap = new Function2<PlayerMovementListener, PredefinedMap, Coord>() {
 		@Override public void call(PlayerMovementListener listener, PredefinedMap map, Coord p) { listener.onPlayerEnteredNewMap(map, p); }
 	};
-	
+
 	@Override
 	public void onPlayerMoved(Coord newPosition, Coord previousPosition) {
 		callAllListeners(this.onPlayerMoved, newPosition, previousPosition);
 	}
-	
+
 	@Override
 	public void onPlayerEnteredNewMap(PredefinedMap map, Coord p) {
 		callAllListeners(this.onPlayerEnteredNewMap, map, p);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
index 06fc98e0c..b719de646 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/listeners/WorldEventListeners.java
@@ -8,27 +8,27 @@ import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import java.util.Collection;
 
 public final class WorldEventListeners extends ListOfListeners<WorldEventListener> implements WorldEventListener {
-	
+
 	private final Function2<WorldEventListener, Monster, String> onPlayerStartedConversation = new Function2<WorldEventListener, Monster, String>() {
 		@Override public void call(WorldEventListener listener, Monster m, String phraseID) { listener.onPlayerStartedConversation(m, phraseID); }
 	};
-	
+
 	private final Function1<WorldEventListener, Monster> onPlayerSteppedOnMonster = new Function1<WorldEventListener, Monster>() {
 		@Override public void call(WorldEventListener listener, Monster m) { listener.onPlayerSteppedOnMonster(m); }
 	};
-	
+
 	private final Function1<WorldEventListener, MapObject> onPlayerSteppedOnMapSignArea = new Function1<WorldEventListener, MapObject>() {
 		@Override public void call(WorldEventListener listener, MapObject area) { listener.onPlayerSteppedOnMapSignArea(area); }
 	};
-	
+
 	private final Function1<WorldEventListener, MapObject> onPlayerSteppedOnKeyArea = new Function1<WorldEventListener, MapObject>() {
 		@Override public void call(WorldEventListener listener, MapObject area) { listener.onPlayerSteppedOnKeyArea(area); }
 	};
-	
+
 	private final Function1<WorldEventListener, MapObject> onPlayerSteppedOnRestArea = new Function1<WorldEventListener, MapObject>() {
 		@Override public void call(WorldEventListener listener, MapObject area) { listener.onPlayerSteppedOnRestArea(area); }
 	};
-	
+
 	private final Function1<WorldEventListener, Loot> onPlayerSteppedOnGroundLoot = new Function1<WorldEventListener, Loot>() {
 		@Override public void call(WorldEventListener listener, Loot loot) { listener.onPlayerSteppedOnGroundLoot(loot); }
 	};
@@ -36,7 +36,7 @@ public final class WorldEventListeners extends ListOfListeners<WorldEventListene
 	private final Function1<WorldEventListener, Loot> onPlayerPickedUpGroundLoot = new Function1<WorldEventListener, Loot>() {
 		@Override public void call(WorldEventListener listener, Loot loot) { listener.onPlayerPickedUpGroundLoot(loot); }
 	};
-	
+
 	private final Function2<WorldEventListener, Collection<Loot>, Integer> onPlayerFoundMonsterLoot = new Function2<WorldEventListener, Collection<Loot>, Integer>() {
 		@Override public void call(WorldEventListener listener, Collection<Loot> loot, Integer exp) { listener.onPlayerFoundMonsterLoot(loot, exp); }
 	};
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java
index 9cef484d6..a0c9947cf 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationCollection.java
@@ -13,7 +13,7 @@ public final class ConversationCollection {
 	public static final String PHRASE_ATTACK = "F";
 	public static final String PHRASE_REMOVE = "R";
 	public static final String REPLY_NEXT = "N";
-	
+
 	private final HashMap<String, Phrase> phrases = new HashMap<String, Phrase>();
 
 	public boolean hasPhrase(String id) {
@@ -28,7 +28,7 @@ public final class ConversationCollection {
 		}
 		return phrases.get(id);
 	}
-	
+
 	public Collection<String> initialize(ConversationListParser parser, String input) {
 		return parser.parseRows(input, phrases);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationLoader.java
index e56af5e47..a241d9396 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/ConversationLoader.java
@@ -15,17 +15,17 @@ public final class ConversationLoader {
 	public void addIDs(int resourceId, Collection<String> ids) {
 		for(String s : ids) resourceIDsPerPhraseID.put(s, resourceId);
 	}
-	
+
 	public Phrase loadPhrase(String phraseID, ConversationCollection conversationCollection, Resources r) {
 		if (conversationCollection.hasPhrase(phraseID)) {
 			return conversationCollection.getPhrase(phraseID);
 		}
 
-        TranslationLoader translationLoader = new TranslationLoader(r.getAssets(), r);
-        ConversationListParser conversationListParser = new ConversationListParser(translationLoader);
+		TranslationLoader translationLoader = new TranslationLoader(r.getAssets(), r);
+		ConversationListParser conversationListParser = new ConversationListParser(translationLoader);
 		int resourceID = resourceIDsPerPhraseID.get(phraseID);
 		conversationCollection.initialize(conversationListParser, ResourceLoader.readStringFromRaw(r, resourceID));
-        translationLoader.close();
+		translationLoader.close();
 
 		return conversationCollection.getPhrase(phraseID);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java
index 5bfebc731..7ba68e220 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/conversation/Phrase.java
@@ -2,11 +2,11 @@ package com.gpl.rpg.AndorsTrail.conversation;
 
 public final class Phrase {
 	private static final Reply[] NO_REPLIES = new Reply[0];
-	
+
 	public final String message;
 	public final Reply[] replies;
 	public final Reward[] rewards; // If this phrase is reached, player will be awarded all these rewards
-	
+
 	public Phrase(String message, Reply[] replies, Reward[] rewards) {
 		this.message = message;
 		if (replies == null || replies.length == 0) replies = NO_REPLIES;
@@ -22,7 +22,7 @@ public final class Phrase {
 		public boolean hasRequirements() {
 			return requires != null;
 		}
-		
+
 		public Reply(String text, String nextPhrase, Requirement[] requires) {
 			this.text = text;
 			this.nextPhrase = nextPhrase;
@@ -33,10 +33,10 @@ public final class Phrase {
 	public static final class Requirement {
 		public static enum RequirementType {
 			questProgress
-			,inventoryRemove  // Player must have item(s) in inventory. Items will be removed when selecting reply.
-			,inventoryKeep    // Player must have item(s) in inventory. Items will NOT be removed when selecting reply.
-			,wear             // Player must be wearing item(s). Items will NOT be removed when selecting reply.
-			,skillLevel       // Player needs to have a specific skill equal to or above a certain level
+			,inventoryRemove	// Player must have item(s) in inventory. Items will be removed when selecting reply.
+			,inventoryKeep		// Player must have item(s) in inventory. Items will NOT be removed when selecting reply.
+			,wear				// Player must be wearing item(s). Items will NOT be removed when selecting reply.
+			,skillLevel			// Player needs to have a specific skill equal to or above a certain level
 			,killedMonster
 		}
 
@@ -50,7 +50,7 @@ public final class Phrase {
 			this.value = value;
 		}
 	}
-	
+
 	public static final class Reward {
 		public static enum RewardType {
 			questProgress
@@ -63,7 +63,7 @@ public final class Phrase {
 		public final RewardType rewardType;
 		public final String rewardID;
 		public final int value;
-		
+
 		public Reward(RewardType rewardType, String rewardID, int value) {
 			this.rewardType = rewardType;
 			this.rewardID = rewardID;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
index 2ddf94d06..329935506 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/GameStatistics.java
@@ -1,176 +1,176 @@
-package com.gpl.rpg.AndorsTrail.model;
-
-import android.content.res.Resources;
-import com.gpl.rpg.AndorsTrail.R;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail.model.quest.Quest;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.*;
-import java.util.Map.Entry;
-
-public final class GameStatistics {
-	private int deaths = 0;
-    private final HashMap<String, Integer> killedMonsters = new HashMap<String, Integer>();
-    private final HashMap<String, Integer> usedItems = new HashMap<String, Integer>();
-	private int spentGold = 0;
-
-	public GameStatistics() { }
-	public void addMonsterKill(String monsterTypeID) {
-		if (!killedMonsters.containsKey(monsterTypeID)) killedMonsters.put(monsterTypeID, 1);
-		else killedMonsters.put(monsterTypeID, killedMonsters.get(monsterTypeID) + 1);
-	}
-	public void addPlayerDeath(int lostExp) {
-		++deaths;
-	}
-	public void addGoldSpent(int amount) {
-		spentGold += amount;
-	}
-	public void addItemUsage(ItemType type) {
-		final String n = type.id;
-		if (!usedItems.containsKey(n)) usedItems.put(n, 1);
-		else usedItems.put(n, usedItems.get(n) + 1);
-	}
-
-	public int getDeaths() {
-		return deaths;
-	}
-
-	public int getSpentGold() {
-		return spentGold;
-	}
-
-	public int getNumberOfKillsForMonsterType(String monsterTypeID) {
-		Integer v = killedMonsters.get(monsterTypeID);
-		if (v == null) return 0;
-		return v;
-	}
-
-	public String getTop5MostCommonlyKilledMonsters(WorldContext world, Resources res) {
-		if (killedMonsters.isEmpty()) return null;
-		List<Entry<String, Integer>> entries = new ArrayList<Entry<String, Integer>>(killedMonsters.entrySet());
-		Collections.sort(entries, descendingValueComparator);
-		StringBuilder sb = new StringBuilder(100);
-		int i = 0;
-		for (Entry<String, Integer> e : entries) {
-			if (i++ >= 5) break;
-			MonsterType t = world.monsterTypes.getMonsterType(e.getKey());
-			if (t == null) continue;
-			sb.append(res.getString(R.string.heroinfo_gamestats_name_and_qty, t.name, e.getValue())).append("\n");
-		}
-		return sb.toString();
-	}
-
-	public String getMostPowerfulKilledMonster(WorldContext world) {
-		if (killedMonsters.isEmpty()) return null;
-		HashMap<String, Integer> expPerMonsterType = new HashMap<String, Integer>(killedMonsters.size());
-		for (String monsterTypeID : killedMonsters.keySet()) {
-			MonsterType t = world.monsterTypes.getMonsterType(monsterTypeID);
-			expPerMonsterType.put(monsterTypeID, t != null ? t.exp : 0);
-		}
-		String monsterTypeID = Collections.min(expPerMonsterType.entrySet(), descendingValueComparator).getKey();
-		MonsterType t = world.monsterTypes.getMonsterType(monsterTypeID);
-		return t != null ? t.name : null;
-	}
-
-	public String getMostCommonlyUsedItem(WorldContext world, Resources res) {
-		if (usedItems.isEmpty()) return null;
-		Entry<String, Integer> e = Collections.min(usedItems.entrySet(), descendingValueComparator);
-		String itemTypeID = e.getKey();
-		ItemType t = world.itemTypes.getItemType(itemTypeID);
-		if (t == null) return null;
-		return res.getString(R.string.heroinfo_gamestats_name_and_qty, t.getName(world.model.player), e.getValue());
-	}
-
-	public int getNumberOfUsedBonemealPotions() {
-		int result = 0;
-		Integer v;
-		if ((v = usedItems.get("bonemeal_potion")) != null) result += v;
-		if ((v = usedItems.get("pot_bm_lodar")) != null) result += v;
-		return result;
-	}
-
-	public int getNumberOfCompletedQuests(WorldContext world) {
-		int result = 0;
-		for (Quest q : world.quests.getAllQuests()) {
-			if (q.isCompleted(world.model.player)) ++result;
-		}
-		return result;
-	}
-
-	public int getNumberOfVisitedMaps(WorldContext world) {
-		int result = 0;
-		for (PredefinedMap m : world.maps.getAllMaps()) {
-			if (m.visited) ++result;
-		}
-		return result;
-	}
-
-	public int getNumberOfUsedItems() {
-		int result = 0;
-		for (int v : usedItems.values()) result += v;
-		return result;
-	}
-
-	public int getNumberOfKilledMonsters() {
-		int result = 0;
-		for (int v : killedMonsters.values()) result += v;
-		return result;
-	}
-
-	private static final Comparator<Entry<String, Integer>> descendingValueComparator = new Comparator<Entry<String, Integer>>() {
-		@Override
-		public int compare(Entry<String, Integer> a, Entry<String, Integer> b) {
-			return b.getValue().compareTo(a.getValue());
-		}
-	};
-
-
-	// ====== PARCELABLE ===================================================================
-
-	public GameStatistics(DataInputStream src, WorldContext world, int fileversion) throws IOException {
-		this.deaths = src.readInt();
-		final int numMonsters = src.readInt();
-		for(int i = 0; i < numMonsters; ++i) {
-			String id = src.readUTF();
-			final int value = src.readInt();
-			if(fileversion <= 23) {
-				MonsterType type = world.monsterTypes.guessMonsterTypeFromName(id);
-				if (type == null) continue;
-				id = type.id;
-			}
-			this.killedMonsters.put(id, value);
-		}
-		if (fileversion <= 17) return;
-		
-		final int numItems = src.readInt();
-		for(int i = 0; i < numItems; ++i) {
-			final String name = src.readUTF();
-			final int value = src.readInt();
-			this.usedItems.put(name, value);
-		}
-		this.spentGold = src.readInt();
-	}
-	
-	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
-		dest.writeInt(deaths);
-		Set<Entry<String, Integer> > set = killedMonsters.entrySet();
-		dest.writeInt(set.size());
-		for (Entry<String, Integer> e : set) {
-			dest.writeUTF(e.getKey());
-			dest.writeInt(e.getValue());
-		}
-		set = usedItems.entrySet();
-		dest.writeInt(set.size());
-		for (Entry<String, Integer> e : set) {
-			dest.writeUTF(e.getKey());
-			dest.writeInt(e.getValue());
-		}
-		dest.writeInt(spentGold);
-	}
-}
+package com.gpl.rpg.AndorsTrail.model;
+
+import android.content.res.Resources;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.*;
+import java.util.Map.Entry;
+
+public final class GameStatistics {
+	private int deaths = 0;
+	private final HashMap<String, Integer> killedMonsters = new HashMap<String, Integer>();
+	private final HashMap<String, Integer> usedItems = new HashMap<String, Integer>();
+	private int spentGold = 0;
+
+	public GameStatistics() { }
+	public void addMonsterKill(String monsterTypeID) {
+		if (!killedMonsters.containsKey(monsterTypeID)) killedMonsters.put(monsterTypeID, 1);
+		else killedMonsters.put(monsterTypeID, killedMonsters.get(monsterTypeID) + 1);
+	}
+	public void addPlayerDeath(int lostExp) {
+		++deaths;
+	}
+	public void addGoldSpent(int amount) {
+		spentGold += amount;
+	}
+	public void addItemUsage(ItemType type) {
+		final String n = type.id;
+		if (!usedItems.containsKey(n)) usedItems.put(n, 1);
+		else usedItems.put(n, usedItems.get(n) + 1);
+	}
+
+	public int getDeaths() {
+		return deaths;
+	}
+
+	public int getSpentGold() {
+		return spentGold;
+	}
+
+	public int getNumberOfKillsForMonsterType(String monsterTypeID) {
+		Integer v = killedMonsters.get(monsterTypeID);
+		if (v == null) return 0;
+		return v;
+	}
+
+	public String getTop5MostCommonlyKilledMonsters(WorldContext world, Resources res) {
+		if (killedMonsters.isEmpty()) return null;
+		List<Entry<String, Integer>> entries = new ArrayList<Entry<String, Integer>>(killedMonsters.entrySet());
+		Collections.sort(entries, descendingValueComparator);
+		StringBuilder sb = new StringBuilder(100);
+		int i = 0;
+		for (Entry<String, Integer> e : entries) {
+			if (i++ >= 5) break;
+			MonsterType t = world.monsterTypes.getMonsterType(e.getKey());
+			if (t == null) continue;
+			sb.append(res.getString(R.string.heroinfo_gamestats_name_and_qty, t.name, e.getValue())).append("\n");
+		}
+		return sb.toString();
+	}
+
+	public String getMostPowerfulKilledMonster(WorldContext world) {
+		if (killedMonsters.isEmpty()) return null;
+		HashMap<String, Integer> expPerMonsterType = new HashMap<String, Integer>(killedMonsters.size());
+		for (String monsterTypeID : killedMonsters.keySet()) {
+			MonsterType t = world.monsterTypes.getMonsterType(monsterTypeID);
+			expPerMonsterType.put(monsterTypeID, t != null ? t.exp : 0);
+		}
+		String monsterTypeID = Collections.min(expPerMonsterType.entrySet(), descendingValueComparator).getKey();
+		MonsterType t = world.monsterTypes.getMonsterType(monsterTypeID);
+		return t != null ? t.name : null;
+	}
+
+	public String getMostCommonlyUsedItem(WorldContext world, Resources res) {
+		if (usedItems.isEmpty()) return null;
+		Entry<String, Integer> e = Collections.min(usedItems.entrySet(), descendingValueComparator);
+		String itemTypeID = e.getKey();
+		ItemType t = world.itemTypes.getItemType(itemTypeID);
+		if (t == null) return null;
+		return res.getString(R.string.heroinfo_gamestats_name_and_qty, t.getName(world.model.player), e.getValue());
+	}
+
+	public int getNumberOfUsedBonemealPotions() {
+		int result = 0;
+		Integer v;
+		if ((v = usedItems.get("bonemeal_potion")) != null) result += v;
+		if ((v = usedItems.get("pot_bm_lodar")) != null) result += v;
+		return result;
+	}
+
+	public int getNumberOfCompletedQuests(WorldContext world) {
+		int result = 0;
+		for (Quest q : world.quests.getAllQuests()) {
+			if (q.isCompleted(world.model.player)) ++result;
+		}
+		return result;
+	}
+
+	public int getNumberOfVisitedMaps(WorldContext world) {
+		int result = 0;
+		for (PredefinedMap m : world.maps.getAllMaps()) {
+			if (m.visited) ++result;
+		}
+		return result;
+	}
+
+	public int getNumberOfUsedItems() {
+		int result = 0;
+		for (int v : usedItems.values()) result += v;
+		return result;
+	}
+
+	public int getNumberOfKilledMonsters() {
+		int result = 0;
+		for (int v : killedMonsters.values()) result += v;
+		return result;
+	}
+
+	private static final Comparator<Entry<String, Integer>> descendingValueComparator = new Comparator<Entry<String, Integer>>() {
+		@Override
+		public int compare(Entry<String, Integer> a, Entry<String, Integer> b) {
+			return b.getValue().compareTo(a.getValue());
+		}
+	};
+
+
+	// ====== PARCELABLE ===================================================================
+
+	public GameStatistics(DataInputStream src, WorldContext world, int fileversion) throws IOException {
+		this.deaths = src.readInt();
+		final int numMonsters = src.readInt();
+		for(int i = 0; i < numMonsters; ++i) {
+			String id = src.readUTF();
+			final int value = src.readInt();
+			if(fileversion <= 23) {
+				MonsterType type = world.monsterTypes.guessMonsterTypeFromName(id);
+				if (type == null) continue;
+				id = type.id;
+			}
+			this.killedMonsters.put(id, value);
+		}
+		if (fileversion <= 17) return;
+
+		final int numItems = src.readInt();
+		for(int i = 0; i < numItems; ++i) {
+			final String name = src.readUTF();
+			final int value = src.readInt();
+			this.usedItems.put(name, value);
+		}
+		this.spentGold = src.readInt();
+	}
+
+	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
+		dest.writeInt(deaths);
+		Set<Entry<String, Integer> > set = killedMonsters.entrySet();
+		dest.writeInt(set.size());
+		for (Entry<String, Integer> e : set) {
+			dest.writeUTF(e.getKey());
+			dest.writeInt(e.getValue());
+		}
+		set = usedItems.entrySet();
+		dest.writeInt(set.size());
+		for (Entry<String, Integer> e : set) {
+			dest.writeUTF(e.getKey());
+			dest.writeInt(e.getValue());
+		}
+		dest.writeInt(spentGold);
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
index 1746c0398..f091f6eb5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/InterfaceData.java
@@ -12,14 +12,14 @@ public final class InterfaceData {
 	public boolean isMainActivityVisible = false;
 	public boolean isInCombat = false;
 	public boolean isPlayersCombatTurn = false;
-    public Monster selectedMonster;
+	public Monster selectedMonster;
 	public Coord selectedPosition;
 	public String selectedTabHeroInfo = "";
 	public int selectedQuestFilter = 0; // Should not be parceled
-	
+
 	public InterfaceData() { }
-	
-	
+
+
 	// ====== PARCELABLE ===================================================================
 
 	public InterfaceData(DataInputStream src, WorldContext world, int fileversion) throws IOException {
@@ -33,7 +33,7 @@ public final class InterfaceData {
 		}
 		this.selectedTabHeroInfo = src.readUTF();
 	}
-	
+
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
 		dest.writeBoolean(isMainActivityVisible);
 		dest.writeBoolean(isInCombat);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
index 35f2ab685..7d4e117f7 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ModelContainer.java
@@ -11,14 +11,14 @@ import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 
 public final class ModelContainer {
-	
+
 	public final Player player;
 	public final InterfaceData uiSelections;
 	public final CombatLog combatLog = new CombatLog();
 	public final GameStatistics statistics;
 	public PredefinedMap currentMap;
 	public LayeredTileMap currentTileMap;
-	
+
 	public ModelContainer() {
 		player = new Player();
 		uiSelections = new InterfaceData();
@@ -37,7 +37,7 @@ public final class ModelContainer {
 		this.statistics = new GameStatistics(src, world, fileversion);
 		this.currentTileMap = null;
 	}
-	
+
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
 		player.writeToParcel(dest, flags);
 		dest.writeUTF(currentMap.name);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java
index 3f76fcd17..61cddd0bc 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorCondition.java
@@ -9,22 +9,22 @@ import com.gpl.rpg.AndorsTrail.context.WorldContext;
 public final class ActorCondition {
 	public static final int MAGNITUDE_REMOVE_ALL = -99;
 	public static final int DURATION_FOREVER = 999;
-	
+
 	public final ActorConditionType conditionType;
 	public int magnitude;
 	public int duration;
-	
+
 	public ActorCondition(ActorConditionType conditionType, int magnitude, int duration) {
 		this.conditionType = conditionType;
 		this.magnitude = magnitude;
 		this.duration = duration;
 	}
-	
+
 	public boolean isTemporaryEffect() { return isTemporaryEffect(duration); }
 	public static boolean isTemporaryEffect(int duration) {
 		return duration != DURATION_FOREVER;
 	}
-	
+
 
 	// ====== PARCELABLE ===================================================================
 
@@ -34,7 +34,7 @@ public final class ActorCondition {
 		this.magnitude = src.readInt();
 		this.duration = src.readInt();
 	}
-	
+
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
 		dest.writeUTF(conditionType.conditionTypeID);
 		dest.writeInt(magnitude);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionEffect.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionEffect.java
index 4da06bc2f..72afb5974 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionEffect.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionEffect.java
@@ -7,18 +7,18 @@ public final class ActorConditionEffect {
 	public final int magnitude;
 	public final int duration;
 	public final ConstRange chance;
-	
+
 	public ActorConditionEffect(ActorConditionType conditionType, int magnitude, int duration, ConstRange chance) {
 		this.conditionType = conditionType;
 		this.magnitude = magnitude;
 		this.duration = duration;
 		this.chance = chance;
 	}
-	
+
 	public boolean isRemovalEffect() {
 		return magnitude == ActorCondition.MAGNITUDE_REMOVE_ALL;
 	}
-	
+
 	public ActorCondition createCondition() { return createCondition(duration); }
 	public ActorCondition createCondition(final int duration) {
 		return new ActorCondition(conditionType, magnitude, duration);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java
index 92f2b9a67..17d7ed4d8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionType.java
@@ -17,15 +17,15 @@ public final class ActorConditionType {
 	public final StatsModifierTraits statsEffect_everyRound;
 	public final StatsModifierTraits statsEffect_everyFullRound;
 	public final AbilityModifierTraits abilityEffect;
-	
+
 	public ActorConditionType(
-			String conditionTypeID, 
-			String name, 
+			String conditionTypeID,
+			String name,
 			int iconID,
 			ConditionCategory conditionCategory,
 			boolean isStacking,
 			boolean isPositive,
-			StatsModifierTraits statsEffect_everyRound, 
+			StatsModifierTraits statsEffect_everyRound,
 			StatsModifierTraits statsEffect_everyFullRound,
 			AbilityModifierTraits abilityEffect) {
 		this.conditionTypeID = conditionTypeID;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java
index e69b55efb..fdd15111c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/ActorConditionTypeCollection.java
@@ -8,7 +8,7 @@ import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class ActorConditionTypeCollection {
 	private final HashMap<String, ActorConditionType> conditionTypes = new HashMap<String, ActorConditionType>();
-	
+
 	public ActorConditionType getActorConditionType(String conditionTypeID) {
 		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
 			if (!conditionTypes.containsKey(conditionTypeID)) {
@@ -17,7 +17,7 @@ public final class ActorConditionTypeCollection {
 		}
 		return conditionTypes.get(conditionTypeID);
 	}
-	
+
 	public void initialize(final ActorConditionsTypeParser parser, String input) {
 		parser.parseRows(input, conditionTypes);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
index 185dd6f4f..8b85c48ee 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillCollection.java
@@ -1,231 +1,231 @@
-package com.gpl.rpg.AndorsTrail.model.ability;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import android.util.SparseArray;
-
-import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-
-public final class SkillCollection {
-	public static enum SkillID {
-		weaponChance
-		,weaponDmg
-		,barter
-		,dodge
-		,barkSkin
-		,moreCriticals
-		,betterCriticals
-		,speed 			// Raises max ap
-		,coinfinder
-		,moreExp
-		,cleave 			// +10ap on kill
-		,eater 			// +1hp per kill
-		,fortitude 		// +N hp per levelup
-		,evasion 		// increase successful flee chance & reduce chance of monster attack
-		,regeneration 	// +N hp per round
-		,lowerExploss
-		,magicfinder
-		,resistanceMental      // lowers chance to get negative active conditions by monsters (Mental like Dazed)
-		,resistancePhysical    // lowers chance to get negative active conditions by monsters (Physical Capacity like Minor fatigue)
-		,resistanceBlood       // lowers chance to get negative active conditions by monsters (Blood Disorder like Weak Poison)
-		,shadowBless
-		,crit1			// lowers atk ability
-		,crit2			// lowers def ability ,rejuvenation	// Reduces magnitudes of conditions
-		,rejuvenation	// Reduces magnitudes of conditions
-		,taunt			// Causes AP loss of attackers that miss
-		,concussion		// AC loss for monsters with (AC-BC)>N
-		,weaponProficiencyDagger
-		,weaponProficiency1hsword
-		,weaponProficiency2hsword
-		,weaponProficiencyAxe
-		,weaponProficiencyBlunt
-		,weaponProficiencyUnarmed
-		,armorProficiencyShield
-		,armorProficiencyUnarmored
-		,armorProficiencyLight
-		,armorProficiencyHeavy
-		,fightstyleDualWield
-		,fightstyle2hand
-		,fightstyleWeaponShield
-		,specializationDualWield
-		,specialization2hand
-		,specializationWeaponShield
-	}
-	
-	public static final int PER_SKILLPOINT_INCREASE_WEAPON_CHANCE = 12;
-	public static final int PER_SKILLPOINT_INCREASE_WEAPON_DAMAGE_MAX = 2;
-	public static final int PER_SKILLPOINT_INCREASE_WEAPON_DAMAGE_MIN = 0;
-	public static final int PER_SKILLPOINT_INCREASE_DODGE = 9;
-	public static final int PER_SKILLPOINT_INCREASE_BARKSKIN = 1;
-	public static final int PER_SKILLPOINT_INCREASE_MORE_CRITICALS_PERCENT = 20;
-	public static final int PER_SKILLPOINT_INCREASE_BETTER_CRITICALS_PERCENT = 25;
-	public static final int PER_SKILLPOINT_INCREASE_SPEED = 1;
-	public static final int PER_SKILLPOINT_INCREASE_BARTER_PRICEFACTOR_PERCENTAGE = 4;
-	public static final int PER_SKILLPOINT_INCREASE_COINFINDER_CHANCE_PERCENT = 30;
-	public static final int PER_SKILLPOINT_INCREASE_MAGICFINDER_CHANCE_PERCENT = 50;
-	public static final int PER_SKILLPOINT_INCREASE_COINFINDER_QUANTITY_PERCENT = 50;
-	public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 5;
-	public static final int PER_SKILLPOINT_INCREASE_CLEAVE_AP = 3;
-	public static final int PER_SKILLPOINT_INCREASE_EATER_HEALTH = 1;
-	public static final int PER_SKILLPOINT_INCREASE_FORTITUDE_HEALTH = 1;
-	public static final int PER_SKILLPOINT_INCREASE_EVASION_FLEE_CHANCE_PERCENTAGE = 5;
-	public static final int PER_SKILLPOINT_INCREASE_EVASION_MONSTER_ATTACK_CHANCE_PERCENTAGE = 5;
-	public static final int PER_SKILLPOINT_INCREASE_REGENERATION = 1;
-	public static final int PER_SKILLPOINT_INCREASE_EXPLOSS_PERCENT = 20;
-	public static final int PER_SKILLPOINT_INCREASE_RESISTANCE_CHANCE_PERCENT = 10;
-	public static final int PER_SKILLPOINT_INCREASE_RESISTANCE_SHADOW_BLESS = 5;
-	public static final int PER_SKILLPOINT_INCREASE_CRIT1_CHANCE = 50;
-	public static final int PER_SKILLPOINT_INCREASE_CRIT2_CHANCE = 50;
-	public static final int PER_SKILLPOINT_INCREASE_REJUVENATION_CHANCE = 20;
-	public static final int PER_SKILLPOINT_INCREASE_TAUNT_CHANCE = 75;
-	public static final int TAUNT_AP_LOSS = 2;
-	public static final int CONCUSSION_THRESHOLD = 50;
-	public static final int PER_SKILLPOINT_INCREASE_CONCUSSION_CHANCE = 15;
-	public static final int PER_SKILLPOINT_INCREASE_WEAPON_PROF_AC_PERCENT = 30;
-	public static final int PER_SKILLPOINT_INCREASE_WEAPON_PROF_CS_PERCENT = 10;
-	public static final int PER_SKILLPOINT_INCREASE_WEAPON_PROF_BC_PERCENT = 30;
-	public static final int PER_SKILLPOINT_INCREASE_UNARMED_AC = 20;
-	public static final int PER_SKILLPOINT_INCREASE_UNARMED_DMG = 2;
-	public static final int PER_SKILLPOINT_INCREASE_UNARMED_BC = 5;
-	public static final int PER_SKILLPOINT_INCREASE_SHIELD_PROF_DR = 1;
-	public static final int PER_SKILLPOINT_INCREASE_UNARMORED_BC = 10;
-	public static final int PER_SKILLPOINT_INCREASE_LIGHT_ARMOR_BC_PERCENT = 30;
-	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT = 20;
-	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT = 25;
-	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT = 25;
-	public static final int PER_SKILLPOINT_INCREASE_FIGHTSTYLE_2HAND_DMG_PERCENT = 30;
-	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_DMG_PERCENT = 50;
-	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_AC_PERCENT = 20;
-	public static final int PER_SKILLPOINT_INCREASE_FIGHTSTYLE_WEAPON_AC_PERCENT = 25;
-	public static final int PER_SKILLPOINT_INCREASE_FIGHTSTYLE_SHIELD_BC_PERCENT = 25;
-	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_WEAPON_AC_PERCENT = 50;
-	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_WEAPON_DMG_PERCENT = 20;
-	public static final int DUALWIELD_EFFICIENCY_LEVEL2 = 100;
-	public static final int DUALWIELD_EFFICIENCY_LEVEL1 = 50;
-	public static final int DUALWIELD_EFFICIENCY_LEVEL0 = 25;
-	public static final int DUALWIELD_LEVEL1_OFFHAND_AP_COST_PERCENT = 50;
-	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_DUALWIELD_AC_PERCENT = 50;
-	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_DUALWIELD_BC_PERCENT = 50;
-
-	private static final int MAX_LEVEL_BARTER = (int) Math.floor((float) Constants.MARKET_PRICEFACTOR_PERCENT / PER_SKILLPOINT_INCREASE_BARTER_PRICEFACTOR_PERCENTAGE);
-	private static final int MAX_LEVEL_BARKSKIN = 5;
-	private static final int MAX_LEVEL_SPEED = 2;
-	private static final int MAX_LEVEL_EVASION = Math.max(
-			Constants.FLEE_FAIL_CHANCE_PERCENT / PER_SKILLPOINT_INCREASE_EVASION_FLEE_CHANCE_PERCENTAGE
-			,Constants.MONSTER_AGGRESSION_CHANCE_PERCENT / PER_SKILLPOINT_INCREASE_EVASION_MONSTER_ATTACK_CHANCE_PERCENTAGE
-			);
-	public static final int MAX_LEVEL_LOWER_EXPLOSS = 100 / PER_SKILLPOINT_INCREASE_EXPLOSS_PERCENT;
-	public static final int MAX_LEVEL_RESISTANCE = 70 / PER_SKILLPOINT_INCREASE_RESISTANCE_CHANCE_PERCENT;
-	
-	private final SparseArray<SkillInfo> skills = new SparseArray<SkillInfo>();
-	private void initializeSkill(SkillInfo skill) {
-		skills.put(skill.id.ordinal(), skill);
-	}
-	public void initialize() {
-		initializeSkill(new SkillInfo(SkillID.weaponChance, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.weaponDmg, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.barter, MAX_LEVEL_BARTER, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.dodge, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.barkSkin, MAX_LEVEL_BARKSKIN, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireExperienceLevels(10, 0) 
-			,SkillLevelRequirement.requirePlayerStats(Player.StatID.blockChance, 15, 0)
-		}));
-		initializeSkill(new SkillInfo(SkillID.moreCriticals, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.betterCriticals, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 1)
-		}));
-		initializeSkill(new SkillInfo(SkillID.speed, MAX_LEVEL_SPEED, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireExperienceLevels(15, 0) 
-		}));
-		initializeSkill(new SkillInfo(SkillID.coinfinder, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.moreExp, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.cleave, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.weaponChance, 1)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.weaponDmg, 1)
-		}));
-		initializeSkill(new SkillInfo(SkillID.eater, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requirePlayerStats(Player.StatID.maxHP, 20, 20)
-		}));
-		initializeSkill(new SkillInfo(SkillID.fortitude, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireExperienceLevels(15, -10)
-		}));
-		initializeSkill(new SkillInfo(SkillID.evasion, MAX_LEVEL_EVASION, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.regeneration, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requirePlayerStats(Player.StatID.maxHP, 30, 0)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.fortitude, 1)
-		}));
-		initializeSkill(new SkillInfo(SkillID.lowerExploss, MAX_LEVEL_LOWER_EXPLOSS, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.magicfinder, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.resistanceMental, MAX_LEVEL_RESISTANCE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.resistancePhysical, MAX_LEVEL_RESISTANCE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.resistanceBlood, MAX_LEVEL_RESISTANCE, SkillInfo.LevelUpType.alwaysShown, null));
-		initializeSkill(new SkillInfo(SkillID.shadowBless, 1, SkillInfo.LevelUpType.onlyByQuests, null));
-		initializeSkill(new SkillInfo(SkillID.crit1, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 3)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 3)
-		}));
-		initializeSkill(new SkillInfo(SkillID.crit2, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 6)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 6)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.crit1, 1)
-		}));
-		initializeSkill(new SkillInfo(SkillID.rejuvenation, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.resistanceBlood, 3)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.resistanceMental, 3)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.resistancePhysical, 3)
-		}));
-		initializeSkill(new SkillInfo(SkillID.taunt, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.evasion, 2)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.dodge, 4)
-		}));
-		initializeSkill(new SkillInfo(SkillID.concussion, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-			SkillLevelRequirement.requireOtherSkill(SkillID.speed, 2)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.weaponChance, 3)
-			,SkillLevelRequirement.requireOtherSkill(SkillID.weaponDmg, 5)
-		}));
-		initializeSkill(new SkillInfo(SkillID.weaponProficiencyDagger, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.weaponProficiency1hsword, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.weaponProficiency2hsword, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.weaponProficiencyAxe, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.weaponProficiencyBlunt, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.weaponProficiencyUnarmed, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.armorProficiencyShield, 2, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.armorProficiencyUnarmored, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.armorProficiencyLight, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.armorProficiencyHeavy, 4, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
-		initializeSkill(new SkillInfo(SkillID.fightstyleDualWield, 2, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-				SkillLevelRequirement.requireExperienceLevels(15, 0) 
-			}));
-		initializeSkill(new SkillInfo(SkillID.fightstyle2hand, 2, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-				SkillLevelRequirement.requireExperienceLevels(15, 0) 
-			}));
-		initializeSkill(new SkillInfo(SkillID.fightstyleWeaponShield, 2, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-				SkillLevelRequirement.requireExperienceLevels(15, 0) 
-			}));
-		initializeSkill(new SkillInfo(SkillID.specializationDualWield, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-				SkillLevelRequirement.requireExperienceLevels(45, 0)
-				,SkillLevelRequirement.requireOtherSkill(SkillID.fightstyleDualWield, 2)
-			}));
-		initializeSkill(new SkillInfo(SkillID.specialization2hand, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-				SkillLevelRequirement.requireExperienceLevels(45, 0)
-				,SkillLevelRequirement.requireOtherSkill(SkillID.fightstyle2hand, 2)
-			}));
-		initializeSkill(new SkillInfo(SkillID.specializationWeaponShield, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
-				SkillLevelRequirement.requireExperienceLevels(45, 0)
-				,SkillLevelRequirement.requireOtherSkill(SkillID.fightstyleWeaponShield, 2)
-			}));
-	}
-
-	public SkillInfo getSkill(SkillID skillID) {
-		return skills.get(skillID.ordinal());
-	}
-	
-	public Collection<SkillInfo> getAllSkills() {
-		ArrayList<SkillInfo> result = new ArrayList<SkillInfo>(skills.size());
-		for(int i = 0; i < skills.size(); ++i) result.add(skills.valueAt(i));
-		return result;
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.ability;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import android.util.SparseArray;
+
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+
+public final class SkillCollection {
+	public static enum SkillID {
+		weaponChance
+		,weaponDmg
+		,barter
+		,dodge
+		,barkSkin
+		,moreCriticals
+		,betterCriticals
+		,speed				// Raises max ap
+		,coinfinder
+		,moreExp
+		,cleave				// +10ap on kill
+		,eater				// +1hp per kill
+		,fortitude			// +N hp per levelup
+		,evasion			// increase successful flee chance & reduce chance of monster attack
+		,regeneration		// +N hp per round
+		,lowerExploss
+		,magicfinder
+		,resistanceMental	// lowers chance to get negative active conditions by monsters (Mental like Dazed)
+		,resistancePhysical	// lowers chance to get negative active conditions by monsters (Physical Capacity like Minor fatigue)
+		,resistanceBlood	// lowers chance to get negative active conditions by monsters (Blood Disorder like Weak Poison)
+		,shadowBless
+		,crit1			// lowers atk ability
+		,crit2			// lowers def ability ,rejuvenation	// Reduces magnitudes of conditions
+		,rejuvenation	// Reduces magnitudes of conditions
+		,taunt			// Causes AP loss of attackers that miss
+		,concussion		// AC loss for monsters with (AC-BC)>N
+		,weaponProficiencyDagger
+		,weaponProficiency1hsword
+		,weaponProficiency2hsword
+		,weaponProficiencyAxe
+		,weaponProficiencyBlunt
+		,weaponProficiencyUnarmed
+		,armorProficiencyShield
+		,armorProficiencyUnarmored
+		,armorProficiencyLight
+		,armorProficiencyHeavy
+		,fightstyleDualWield
+		,fightstyle2hand
+		,fightstyleWeaponShield
+		,specializationDualWield
+		,specialization2hand
+		,specializationWeaponShield
+	}
+
+	public static final int PER_SKILLPOINT_INCREASE_WEAPON_CHANCE = 12;
+	public static final int PER_SKILLPOINT_INCREASE_WEAPON_DAMAGE_MAX = 2;
+	public static final int PER_SKILLPOINT_INCREASE_WEAPON_DAMAGE_MIN = 0;
+	public static final int PER_SKILLPOINT_INCREASE_DODGE = 9;
+	public static final int PER_SKILLPOINT_INCREASE_BARKSKIN = 1;
+	public static final int PER_SKILLPOINT_INCREASE_MORE_CRITICALS_PERCENT = 20;
+	public static final int PER_SKILLPOINT_INCREASE_BETTER_CRITICALS_PERCENT = 25;
+	public static final int PER_SKILLPOINT_INCREASE_SPEED = 1;
+	public static final int PER_SKILLPOINT_INCREASE_BARTER_PRICEFACTOR_PERCENTAGE = 4;
+	public static final int PER_SKILLPOINT_INCREASE_COINFINDER_CHANCE_PERCENT = 30;
+	public static final int PER_SKILLPOINT_INCREASE_MAGICFINDER_CHANCE_PERCENT = 50;
+	public static final int PER_SKILLPOINT_INCREASE_COINFINDER_QUANTITY_PERCENT = 50;
+	public static final int PER_SKILLPOINT_INCREASE_MORE_EXP_PERCENT = 5;
+	public static final int PER_SKILLPOINT_INCREASE_CLEAVE_AP = 3;
+	public static final int PER_SKILLPOINT_INCREASE_EATER_HEALTH = 1;
+	public static final int PER_SKILLPOINT_INCREASE_FORTITUDE_HEALTH = 1;
+	public static final int PER_SKILLPOINT_INCREASE_EVASION_FLEE_CHANCE_PERCENTAGE = 5;
+	public static final int PER_SKILLPOINT_INCREASE_EVASION_MONSTER_ATTACK_CHANCE_PERCENTAGE = 5;
+	public static final int PER_SKILLPOINT_INCREASE_REGENERATION = 1;
+	public static final int PER_SKILLPOINT_INCREASE_EXPLOSS_PERCENT = 20;
+	public static final int PER_SKILLPOINT_INCREASE_RESISTANCE_CHANCE_PERCENT = 10;
+	public static final int PER_SKILLPOINT_INCREASE_RESISTANCE_SHADOW_BLESS = 5;
+	public static final int PER_SKILLPOINT_INCREASE_CRIT1_CHANCE = 50;
+	public static final int PER_SKILLPOINT_INCREASE_CRIT2_CHANCE = 50;
+	public static final int PER_SKILLPOINT_INCREASE_REJUVENATION_CHANCE = 20;
+	public static final int PER_SKILLPOINT_INCREASE_TAUNT_CHANCE = 75;
+	public static final int TAUNT_AP_LOSS = 2;
+	public static final int CONCUSSION_THRESHOLD = 50;
+	public static final int PER_SKILLPOINT_INCREASE_CONCUSSION_CHANCE = 15;
+	public static final int PER_SKILLPOINT_INCREASE_WEAPON_PROF_AC_PERCENT = 30;
+	public static final int PER_SKILLPOINT_INCREASE_WEAPON_PROF_CS_PERCENT = 10;
+	public static final int PER_SKILLPOINT_INCREASE_WEAPON_PROF_BC_PERCENT = 30;
+	public static final int PER_SKILLPOINT_INCREASE_UNARMED_AC = 20;
+	public static final int PER_SKILLPOINT_INCREASE_UNARMED_DMG = 2;
+	public static final int PER_SKILLPOINT_INCREASE_UNARMED_BC = 5;
+	public static final int PER_SKILLPOINT_INCREASE_SHIELD_PROF_DR = 1;
+	public static final int PER_SKILLPOINT_INCREASE_UNARMORED_BC = 10;
+	public static final int PER_SKILLPOINT_INCREASE_LIGHT_ARMOR_BC_PERCENT = 30;
+	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_BC_PERCENT = 20;
+	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_MOVECOST_PERCENT = 25;
+	public static final int PER_SKILLPOINT_INCREASE_HEAVY_ARMOR_ATKCOST_PERCENT = 25;
+	public static final int PER_SKILLPOINT_INCREASE_FIGHTSTYLE_2HAND_DMG_PERCENT = 30;
+	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_DMG_PERCENT = 50;
+	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_2HAND_AC_PERCENT = 20;
+	public static final int PER_SKILLPOINT_INCREASE_FIGHTSTYLE_WEAPON_AC_PERCENT = 25;
+	public static final int PER_SKILLPOINT_INCREASE_FIGHTSTYLE_SHIELD_BC_PERCENT = 25;
+	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_WEAPON_AC_PERCENT = 50;
+	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_WEAPON_DMG_PERCENT = 20;
+	public static final int DUALWIELD_EFFICIENCY_LEVEL2 = 100;
+	public static final int DUALWIELD_EFFICIENCY_LEVEL1 = 50;
+	public static final int DUALWIELD_EFFICIENCY_LEVEL0 = 25;
+	public static final int DUALWIELD_LEVEL1_OFFHAND_AP_COST_PERCENT = 50;
+	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_DUALWIELD_AC_PERCENT = 50;
+	public static final int PER_SKILLPOINT_INCREASE_SPECIALIZATION_DUALWIELD_BC_PERCENT = 50;
+
+	private static final int MAX_LEVEL_BARTER = (int) Math.floor((float) Constants.MARKET_PRICEFACTOR_PERCENT / PER_SKILLPOINT_INCREASE_BARTER_PRICEFACTOR_PERCENTAGE);
+	private static final int MAX_LEVEL_BARKSKIN = 5;
+	private static final int MAX_LEVEL_SPEED = 2;
+	private static final int MAX_LEVEL_EVASION = Math.max(
+			Constants.FLEE_FAIL_CHANCE_PERCENT / PER_SKILLPOINT_INCREASE_EVASION_FLEE_CHANCE_PERCENTAGE
+			,Constants.MONSTER_AGGRESSION_CHANCE_PERCENT / PER_SKILLPOINT_INCREASE_EVASION_MONSTER_ATTACK_CHANCE_PERCENTAGE
+			);
+	public static final int MAX_LEVEL_LOWER_EXPLOSS = 100 / PER_SKILLPOINT_INCREASE_EXPLOSS_PERCENT;
+	public static final int MAX_LEVEL_RESISTANCE = 70 / PER_SKILLPOINT_INCREASE_RESISTANCE_CHANCE_PERCENT;
+
+	private final SparseArray<SkillInfo> skills = new SparseArray<SkillInfo>();
+	private void initializeSkill(SkillInfo skill) {
+		skills.put(skill.id.ordinal(), skill);
+	}
+	public void initialize() {
+		initializeSkill(new SkillInfo(SkillID.weaponChance, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.weaponDmg, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.barter, MAX_LEVEL_BARTER, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.dodge, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.barkSkin, MAX_LEVEL_BARKSKIN, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireExperienceLevels(10, 0)
+			,SkillLevelRequirement.requirePlayerStats(Player.StatID.blockChance, 15, 0)
+		}));
+		initializeSkill(new SkillInfo(SkillID.moreCriticals, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.betterCriticals, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 1)
+		}));
+		initializeSkill(new SkillInfo(SkillID.speed, MAX_LEVEL_SPEED, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireExperienceLevels(15, 0)
+		}));
+		initializeSkill(new SkillInfo(SkillID.coinfinder, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.moreExp, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.cleave, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireOtherSkill(SkillID.weaponChance, 1)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.weaponDmg, 1)
+		}));
+		initializeSkill(new SkillInfo(SkillID.eater, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requirePlayerStats(Player.StatID.maxHP, 20, 20)
+		}));
+		initializeSkill(new SkillInfo(SkillID.fortitude, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireExperienceLevels(15, -10)
+		}));
+		initializeSkill(new SkillInfo(SkillID.evasion, MAX_LEVEL_EVASION, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.regeneration, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requirePlayerStats(Player.StatID.maxHP, 30, 0)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.fortitude, 1)
+		}));
+		initializeSkill(new SkillInfo(SkillID.lowerExploss, MAX_LEVEL_LOWER_EXPLOSS, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.magicfinder, SkillInfo.MAXLEVEL_NONE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.resistanceMental, MAX_LEVEL_RESISTANCE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.resistancePhysical, MAX_LEVEL_RESISTANCE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.resistanceBlood, MAX_LEVEL_RESISTANCE, SkillInfo.LevelUpType.alwaysShown, null));
+		initializeSkill(new SkillInfo(SkillID.shadowBless, 1, SkillInfo.LevelUpType.onlyByQuests, null));
+		initializeSkill(new SkillInfo(SkillID.crit1, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 3)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 3)
+		}));
+		initializeSkill(new SkillInfo(SkillID.crit2, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireOtherSkill(SkillID.moreCriticals, 6)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.betterCriticals, 6)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.crit1, 1)
+		}));
+		initializeSkill(new SkillInfo(SkillID.rejuvenation, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireOtherSkill(SkillID.resistanceBlood, 3)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.resistanceMental, 3)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.resistancePhysical, 3)
+		}));
+		initializeSkill(new SkillInfo(SkillID.taunt, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireOtherSkill(SkillID.evasion, 2)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.dodge, 4)
+		}));
+		initializeSkill(new SkillInfo(SkillID.concussion, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+			SkillLevelRequirement.requireOtherSkill(SkillID.speed, 2)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.weaponChance, 3)
+			,SkillLevelRequirement.requireOtherSkill(SkillID.weaponDmg, 5)
+		}));
+		initializeSkill(new SkillInfo(SkillID.weaponProficiencyDagger, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.weaponProficiency1hsword, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.weaponProficiency2hsword, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.weaponProficiencyAxe, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.weaponProficiencyBlunt, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.weaponProficiencyUnarmed, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.armorProficiencyShield, 2, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.armorProficiencyUnarmored, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.armorProficiencyLight, 3, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.armorProficiencyHeavy, 4, SkillInfo.LevelUpType.firstLevelRequiresQuest, null));
+		initializeSkill(new SkillInfo(SkillID.fightstyleDualWield, 2, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+				SkillLevelRequirement.requireExperienceLevels(15, 0)
+			}));
+		initializeSkill(new SkillInfo(SkillID.fightstyle2hand, 2, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+				SkillLevelRequirement.requireExperienceLevels(15, 0)
+			}));
+		initializeSkill(new SkillInfo(SkillID.fightstyleWeaponShield, 2, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+				SkillLevelRequirement.requireExperienceLevels(15, 0)
+			}));
+		initializeSkill(new SkillInfo(SkillID.specializationDualWield, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+				SkillLevelRequirement.requireExperienceLevels(45, 0)
+				,SkillLevelRequirement.requireOtherSkill(SkillID.fightstyleDualWield, 2)
+			}));
+		initializeSkill(new SkillInfo(SkillID.specialization2hand, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+				SkillLevelRequirement.requireExperienceLevels(45, 0)
+				,SkillLevelRequirement.requireOtherSkill(SkillID.fightstyle2hand, 2)
+			}));
+		initializeSkill(new SkillInfo(SkillID.specializationWeaponShield, 1, SkillInfo.LevelUpType.alwaysShown, new SkillLevelRequirement[] {
+				SkillLevelRequirement.requireExperienceLevels(45, 0)
+				,SkillLevelRequirement.requireOtherSkill(SkillID.fightstyleWeaponShield, 2)
+			}));
+	}
+
+	public SkillInfo getSkill(SkillID skillID) {
+		return skills.get(skillID.ordinal());
+	}
+
+	public Collection<SkillInfo> getAllSkills() {
+		ArrayList<SkillInfo> result = new ArrayList<SkillInfo>(skills.size());
+		for(int i = 0; i < skills.size(); ++i) result.add(skills.valueAt(i));
+		return result;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java
index 1f9bd2bb1..fec099dfb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/SkillInfo.java
@@ -20,25 +20,25 @@ public final class SkillInfo {
 		this.levelupVisibility = levelupVisibility;
 		this.levelupRequirements = levelupRequirements;
 	}
-	
+
 	public boolean hasMaxLevel() {
 		if (maxLevel == MAXLEVEL_NONE) return false;
 		else return true;
 	}
-	
+
 	public boolean hasLevelupRequirements() {
 		return levelupRequirements != null;
 	}
-	
+
 	public boolean canLevelUpSkillTo(Player player, int requestedSkillLevel) {
 		if (!hasLevelupRequirements()) return true;
-		
+
 		for (SkillLevelRequirement requirement : levelupRequirements) {
 			if (!requirement.isSatisfiedByPlayer(player, requestedSkillLevel)) return false;
 		}
 		return true;
 	}
-	
+
 	public static final class SkillLevelRequirement {
 		public static enum RequirementType {
 			skillLevel
@@ -49,14 +49,14 @@ public final class SkillInfo {
 		public final String skillOrStatID;
 		public final int everySkillLevelRequiresThisAmount;
 		public final int initialRequiredAmount;
-		
+
 		private SkillLevelRequirement(RequirementType requirementType, int everySkillLevelRequiresThisAmount, int initialRequiredAmount, String skillOrStatID) {
 			this.requirementType = requirementType;
 			this.skillOrStatID = skillOrStatID;
 			this.everySkillLevelRequiresThisAmount = everySkillLevelRequiresThisAmount;
 			this.initialRequiredAmount = initialRequiredAmount;
 		}
-		
+
 		public static SkillLevelRequirement requireOtherSkill(SkillCollection.SkillID skillID, int everySkillLevelRequiresThisAmount) {
 			return new SkillLevelRequirement(RequirementType.skillLevel, everySkillLevelRequiresThisAmount, 0, skillID.name());
 		}
@@ -66,18 +66,18 @@ public final class SkillInfo {
 		public static SkillLevelRequirement requirePlayerStats(Player.StatID statID, int everySkillLevelRequiresThisAmount, int initialRequiredAmount) {
 			return new SkillLevelRequirement(RequirementType.playerStat, everySkillLevelRequiresThisAmount, initialRequiredAmount, statID.name());
 		}
-		
+
 		public boolean isSatisfiedByPlayer(Player player, int requestedSkillLevel) {
 			final int minimumValueRequired = getRequiredValue(requestedSkillLevel);
 			final int playerValue = getRequirementActualValue(player);
 			if (playerValue >= minimumValueRequired) return true;
 			return false;
 		}
-		
+
 		public int getRequiredValue(int requestedSkillLevel) {
 			return requestedSkillLevel * everySkillLevelRequiresThisAmount + initialRequiredAmount;
 		}
-		
+
 		private int getRequirementActualValue(Player player) {
 			switch (requirementType) {
 			case skillLevel: return player.getSkillLevel(SkillCollection.SkillID.valueOf(skillOrStatID));
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/AbilityModifierTraits.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/AbilityModifierTraits.java
index de81a74da..eff69d475 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/AbilityModifierTraits.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/AbilityModifierTraits.java
@@ -15,10 +15,10 @@ public final class AbilityModifierTraits {
 	public final int increaseCriticalSkill;
 	public final float setCriticalMultiplier;
 	public final int increaseDamageResistance;
-	
+
 	public AbilityModifierTraits(
-			int increaseMaxHP, 
-			int increaseMaxAP, 
+			int increaseMaxHP,
+			int increaseMaxAP,
 			int increaseMoveCost,
 			int increaseUseItemCost,
 			int increaseReequipCost,
@@ -45,7 +45,7 @@ public final class AbilityModifierTraits {
 		this.setCriticalMultiplier = setCriticalMultiplier;
 		this.increaseDamageResistance = increaseDamageResistance;
 	}
-	
+
 	public int calculateCost(boolean isWeapon) {
 		final int costBC = (int) (3*Math.pow(Math.max(0, increaseBlockChance), 2.5) + 28*increaseBlockChance);
 		final int costAC = (int) (0.4*Math.pow(Math.max(0,increaseAttackChance), 2.5) - 6*Math.pow(Math.abs(Math.min(0,increaseAttackChance)),2.7));
@@ -61,7 +61,7 @@ public final class AbilityModifierTraits {
 				:(int) (2*Math.pow(Math.max(0, increaseMaxDamage), 3) + increaseMaxDamage*20);
 		final int costCS = (int) (2.2*Math.pow(increaseCriticalSkill, 3));
 		final int costCM = (int) (50*Math.pow(Math.max(0, setCriticalMultiplier), 2));
-				
+
 		final int costMaxHP = (int) (30*Math.pow(Math.max(0,increaseMaxHP), 1.2) + 70*increaseMaxHP);
 		final int costMaxAP = (int) (50*Math.pow(Math.max(0,increaseMaxAP), 3) + 750*increaseMaxAP);
 		final int costMovement = (int) (510*Math.pow(Math.max(0,-increaseMoveCost), 2.5) - 350*increaseMoveCost);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java
index 553341768..24ebe81f6 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/ability/traits/StatsModifierTraits.java
@@ -7,7 +7,7 @@ public final class StatsModifierTraits {
 	public final VisualEffectCollection.VisualEffectID visualEffectID;
 	public final ConstRange currentHPBoost;
 	public final ConstRange currentAPBoost;
-	
+
 	public StatsModifierTraits(
 			VisualEffectCollection.VisualEffectID visualEffectID
 			, ConstRange currentHPBoost
@@ -16,11 +16,11 @@ public final class StatsModifierTraits {
 		this.currentHPBoost = currentHPBoost;
 		this.currentAPBoost = currentAPBoost;
 	}
-	
+
 	public int calculateUseCost() {
 		final float averageHPBoost = currentHPBoost == null ? 0 : currentHPBoost.averagef();
 		if (averageHPBoost == 0) return 0;
-		
+
 		final int costBoostHP = (int) (0.1*Math.signum(averageHPBoost)*Math.pow(Math.abs(averageHPBoost), 2) + 3*averageHPBoost);
 		return costBoostHP;
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
index 25e06f50d..ec2e517e0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Actor.java
@@ -21,7 +21,7 @@ public class Actor {
 	public final boolean isPlayer;
 	private final boolean isImmuneToCriticalHits;
 	protected String name;
-	
+
 	// TODO: Should be privates
 	public final Range ap = new Range();
 	public final Range health = new Range();
@@ -35,14 +35,14 @@ public class Actor {
 	public int blockChance;
 	public int damageResistance;
 	public ItemTraits_OnUse[] onHitEffects;
-	
+
 	public Actor(Size tileSize, boolean isPlayer, boolean isImmuneToCriticalHits) {
 		this.tileSize = tileSize;
 		this.rectPosition = new CoordRect(this.position, this.tileSize);
 		this.isPlayer = isPlayer;
 		this.isImmuneToCriticalHits = isImmuneToCriticalHits;
 	}
-	
+
 	public boolean isImmuneToCriticalHits() { return isImmuneToCriticalHits; }
 	public String getName() { return name; }
 	public int getCurrentAP() { return ap.current; }
@@ -59,11 +59,11 @@ public class Actor {
 	public int getDamageResistance() { return damageResistance; }
 	public ItemTraits_OnUse[] getOnHitEffects() { return onHitEffects; }
 	public List<ItemTraits_OnUse> getOnHitEffectsAsList() { return onHitEffects == null ? null : Arrays.asList(onHitEffects); }
-	
+
 	public boolean hasCriticalSkillEffect() { return getCriticalSkill() != 0; }
 	public boolean hasCriticalMultiplierEffect() { float m = getCriticalMultiplier(); return m != 0 && m != 1; }
 	public boolean hasCriticalAttacks() { return hasCriticalSkillEffect() && hasCriticalMultiplierEffect(); }
-	
+
 	public int getAttacksPerTurn() { return (int) Math.floor(getMaxAP() / getAttackCost()); }
 	public int getEffectiveCriticalChance() { return getEffectiveCriticalChance(getCriticalSkill()); }
 	public static int getEffectiveCriticalChance(int criticalSkill) {
@@ -72,15 +72,15 @@ public class Actor {
 		if (v < 0) return 0;
 		return v;
 	}
-	
+
 	public boolean isDead() {
 		return health.current <= 0;
 	}
-	
+
 	public boolean hasAPs(int cost) {
 		return ap.current >= cost;
 	}
-	
+
 	public boolean hasCondition(final String conditionTypeID) {
 		for (ActorCondition c : conditions) {
 			if (c.conditionType.conditionTypeID.equals(conditionTypeID)) return true;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
index 1185a9f95..62bed101e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Monster.java
@@ -20,7 +20,7 @@ public final class Monster extends Actor {
 	public Coord movementDestination = null;
 	public long nextActionTime = 0;
 	public final CoordRect nextPosition;
-	
+
 	private boolean forceAggressive = false;
 	private ItemContainer shopItems = null;
 
@@ -29,7 +29,7 @@ public final class Monster extends Actor {
 	public Monster(MonsterType monsterType) {
 		super(monsterType.tileSize, false, monsterType.isImmuneToCriticalHits());
 		this.monsterType = monsterType;
-        this.iconID = monsterType.iconID;
+		this.iconID = monsterType.iconID;
 		this.nextPosition = new CoordRect(new Coord(), monsterType.tileSize);
 		resetStatsToBaseTraits();
 		this.ap.setMax();
@@ -81,7 +81,7 @@ public final class Monster extends Actor {
 	public boolean isAdjacentTo(Player p) {
 		return this.rectPosition.isAdjacentTo(p.position);
 	}
-	
+
 	public boolean isAgressive() {
 		return getPhraseID() == null || forceAggressive;
 	}
@@ -89,8 +89,8 @@ public final class Monster extends Actor {
 	public void forceAggressive() {
 		forceAggressive = true;
 	}
-	
-	
+
+
 	// ====== PARCELABLE ===================================================================
 
 	public static Monster readFromParcel(DataInputStream src, WorldContext world, int fileversion) throws IOException {
@@ -99,15 +99,15 @@ public final class Monster extends Actor {
 			monsterTypeId = monsterTypeId.replace(' ', '_').replace("\\'", "").toLowerCase();
 		}
 		MonsterType monsterType = world.monsterTypes.getMonsterType(monsterTypeId);
-		
+
 		if (fileversion < 25) return LegacySavegameFormatReaderForMonster.readFromParcel_pre_v25(src, fileversion, monsterType);
-		
+
 		return new Monster(src, world, fileversion, monsterType);
 	}
 
 	private Monster(DataInputStream src, WorldContext world, int fileversion, MonsterType monsterType) throws IOException {
 		this(monsterType);
-		
+
 		boolean readCombatTraits = true;
 		if (fileversion >= 25) readCombatTraits = src.readBoolean();
 		if (readCombatTraits) {
@@ -123,7 +123,7 @@ public final class Monster extends Actor {
 			this.blockChance = src.readInt();
 			this.damageResistance = src.readInt();
 		}
-		
+
 		this.ap.readFromParcel(src, fileversion);
 		this.health.readFromParcel(src, fileversion);
 		this.position.readFromParcel(src, fileversion);
@@ -133,7 +133,7 @@ public final class Monster extends Actor {
 				conditions.add(new ActorCondition(src, world, fileversion));
 			}
 		}
-		
+
 		if (fileversion >= 34) {
 			this.moveCost = src.readInt();
 		}
@@ -175,7 +175,7 @@ public final class Monster extends Actor {
 			c.writeToParcel(dest, flags);
 		}
 		dest.writeInt(moveCost);
-		
+
 		dest.writeBoolean(forceAggressive);
 		if (shopItems != null) {
 			dest.writeBoolean(true);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterType.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterType.java
index d671f5c73..40058bf63 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterType.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterType.java
@@ -47,13 +47,13 @@ public final class MonsterType {
 	public final int blockChance;
 	public final int damageResistance;
 	public final ItemTraits_OnUse[] onHitEffects;
-	
+
 	public MonsterType(
-			String id, 
+			String id,
 			String name,
-			String spawnGroup, 
-			int exp, 
-			DropList dropList, 
+			String spawnGroup,
+			int exp,
+			DropList dropList,
 			String phraseID,
 			boolean isUnique,
 			String faction,
@@ -99,8 +99,8 @@ public final class MonsterType {
 
 	public static enum AggressionType {
 		none
-		,helpOthers     // Will move to help if the player attacks some other monster in the same spawn.
-		,protectSpawn;  // Will move to attack if the player stands inside the spawn.
+		,helpOthers		// Will move to help if the player attacks some other monster in the same spawn.
+		,protectSpawn;	// Will move to attack if the player stands inside the spawn.
 
 		public static AggressionType fromString(String s, AggressionType default_) {
 			if (s == null) return default_;
@@ -114,9 +114,9 @@ public final class MonsterType {
 		if (monsterClass == MonsterClass.demon) return true;
 		return false;
 	}
-	
+
 	public boolean hasCombatStats() {
-		if (attackCost != 10) return true; 
+		if (attackCost != 10) return true;
 		if (attackChance != 0) return true;
 		if (criticalSkill != 0) return true;
 		if (criticalMultiplier != 0) return true;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
index 8504f1eaf..296e5a17c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/MonsterTypeCollection.java
@@ -9,7 +9,7 @@ import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class MonsterTypeCollection {
 	private final HashMap<String, MonsterType> monsterTypesById = new HashMap<String, MonsterType>();
-	
+
 	public MonsterType getMonsterType(String id) {
 		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
 			if (!monsterTypesById.containsKey(id)) {
@@ -24,21 +24,21 @@ public final class MonsterTypeCollection {
 		for (MonsterType t : monsterTypesById.values()) {
 			if (t.spawnGroup.equalsIgnoreCase(spawnGroup)) result.add(t);
 		}
-		
+
 		return result;
 	}
-	
+
 	public MonsterType guessMonsterTypeFromName(String name) {
 		for (MonsterType t : monsterTypesById.values()) {
 			if (t.name.equalsIgnoreCase(name)) return t;
 		}
 		return null;
 	}
-	
+
 	public void initialize(MonsterTypeParser parser, String input) {
 		parser.parseRows(input, monsterTypesById);
 	}
-	
+
 	// Unit test method. Not part of the game logic.
 	public HashMap<String, MonsterType> UNITTEST_getAllMonsterTypes() {
 		return monsterTypesById;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
index 553a736cc..c297248a4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/actor/Player.java
@@ -31,7 +31,7 @@ public final class Player extends Actor {
 	public static final int DEFAULT_PLAYER_ATTACKCOST = 4;
 	public final Coord lastPosition;
 	public final Coord nextPosition;
-	
+
 	// TODO: Should be privates
 	public int level;
 	public final PlayerBaseTraits baseTraits = new PlayerBaseTraits();
@@ -42,7 +42,7 @@ public final class Player extends Actor {
 	public int useItemCost;
 	public int reequipCost;
 	public int totalExperience;
-	
+
 	private final HashMap<String, HashSet<Integer> > questProgress = new HashMap<String, HashSet<Integer> >();
 	private String spawnMap;
 	private String spawnPlace;
@@ -80,7 +80,7 @@ public final class Player extends Actor {
 		this.useItemCost = this.baseTraits.useItemCost;
 		this.reequipCost = this.baseTraits.reequipCost;
 	}
-	
+
 	public Player() {
 		super(
 			new Size(1, 1)
@@ -92,7 +92,7 @@ public final class Player extends Actor {
 		this.levelExperience = new Range();
 		this.inventory = new Inventory();
 	}
-	
+
 	public void initializeNewPlayer(ItemTypeCollection types, DropListCollection dropLists, String name) {
 		baseTraits.iconID = TileManager.CHAR_HERO;
 		baseTraits.maxAP = 10;
@@ -118,11 +118,11 @@ public final class Player extends Actor {
 		this.ap.set(baseTraits.maxAP, baseTraits.maxAP);
 		this.health.set(baseTraits.maxHP, baseTraits.maxHP);
 		this.conditions.clear();
-		
+
 		Loot startItems = new Loot();
 		dropLists.getDropList(DropListCollection.DROPLIST_STARTITEMS).createRandomLoot(startItems, this);
 		inventory.add(startItems);
-		
+
 		if (AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES) {
 			this.spawnMap = "debugmap";
 			this.spawnPlace = "start";
@@ -131,11 +131,11 @@ public final class Player extends Actor {
 			this.spawnPlace = "rest";
 		}
 	}
-	
+
 	public boolean hasExactQuestProgress(QuestProgress progress) { return hasExactQuestProgress(progress.questID, progress.progress); }
 	public boolean hasExactQuestProgress(String questID, int progress) {
 		if (!questProgress.containsKey(questID)) return false;
-		return questProgress.get(questID).contains(progress); 
+		return questProgress.get(questID).contains(progress);
 	}
 	public boolean hasAnyQuestProgress(String questID) {
 		return questProgress.containsKey(questID);
@@ -143,7 +143,7 @@ public final class Player extends Actor {
 	public boolean addQuestProgress(QuestProgress progress) {
 		if (hasExactQuestProgress(progress.questID, progress.progress)) return false;
 		if (!questProgress.containsKey(progress.questID)) questProgress.put(progress.questID, new HashSet<Integer>());
-		questProgress.get(progress.questID).add(progress.progress); 
+		questProgress.get(progress.questID).add(progress.progress);
 		return true; //Progress was added.
 	}
 
@@ -151,7 +151,7 @@ public final class Player extends Actor {
 		int experienceRequiredToReachThisLevel = getRequiredExperience(level);
 		levelExperience.set(getRequiredExperienceForNextLevel(level), totalExperience - experienceRequiredToReachThisLevel);
 	}
-	
+
 	private static int getRequiredExperience(int currentLevel) {
 		int v = 0;
 		for(int i = 1; i < currentLevel; ++i) {
@@ -180,10 +180,10 @@ public final class Player extends Actor {
 		return getSkillLevel(skillID) > 0;
 	}
 	public boolean nextLevelAddsNewSkillpoint() {
-    	return thisLevelAddsNewSkillpoint(level + 1);
+		return thisLevelAddsNewSkillpoint(level + 1);
 	}
 	private static boolean thisLevelAddsNewSkillpoint(int level) {
-    	return ((level - Constants.FIRST_SKILL_POINT_IS_GIVEN_AT_LEVEL) % Constants.NEW_SKILL_POINT_EVERY_N_LEVELS == 0);
+		return ((level - Constants.FIRST_SKILL_POINT_IS_GIVEN_AT_LEVEL) % Constants.NEW_SKILL_POINT_EVERY_N_LEVELS == 0);
 	}
 	public boolean hasAvailableSkillpoints() {
 		return availableSkillIncreases > 0;
@@ -207,7 +207,7 @@ public final class Player extends Actor {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public int getReequipCost() { return reequipCost; }
 	public int getUseItemCost() { return useItemCost; }
 	public int getAvailableSkillIncreases() { return availableSkillIncreases; }
@@ -250,7 +250,7 @@ public final class Player extends Actor {
 		}
 		return 0;
 	}
-	
+
 	// ====== PARCELABLE ===================================================================
 
 	public static Player readFromParcel(DataInputStream src, WorldContext world, ControllerContext controllers, int fileversion) throws IOException {
@@ -258,19 +258,19 @@ public final class Player extends Actor {
 		LegacySavegameFormatReaderForPlayer.upgradeSavegame(player, world, controllers, fileversion);
 		return player;
 	}
-	
+
 	public Player(DataInputStream src, WorldContext world, int fileversion) throws IOException {
 		this();
-		
+
 		if (fileversion <= 33) LegacySavegameFormatReaderForPlayer.readCombatTraitsPreV034(src, fileversion);
-		
+
 		this.baseTraits.iconID = src.readInt();
 		if (fileversion <= 33) /*this.tileSize = */new Size(src, fileversion);
 		this.baseTraits.maxAP = src.readInt();
 		this.baseTraits.maxHP = src.readInt();
 		this.name = src.readUTF();
 		this.moveCost = src.readInt();
-		
+
 		this.baseTraits.attackCost = src.readInt();
 		this.baseTraits.attackChance = src.readInt();
 		this.baseTraits.criticalSkill = src.readInt();
@@ -282,13 +282,13 @@ public final class Player extends Actor {
 		this.baseTraits.damagePotential.readFromParcel(src, fileversion);
 		this.baseTraits.blockChance = src.readInt();
 		this.baseTraits.damageResistance = src.readInt();
-		
+
 		if (fileversion <= 16) {
 			this.baseTraits.moveCost = this.moveCost;
 		} else {
 			this.baseTraits.moveCost = src.readInt();
 		}
-				
+
 		this.ap.set(new Range(src, fileversion));
 		this.health.set(new Range(src, fileversion));
 		this.position.set(new Coord(src, fileversion));
@@ -298,13 +298,13 @@ public final class Player extends Actor {
 				this.conditions.add(new ActorCondition(src, world, fileversion));
 			}
 		}
-		
+
 		this.lastPosition.readFromParcel(src, fileversion);
 		this.nextPosition.readFromParcel(src, fileversion);
 		this.level = src.readInt();
 		this.totalExperience = src.readInt();
 		this.inventory.readFromParcel(src, world, fileversion);
-		
+
 		if (fileversion <= 13) LegacySavegameFormatReaderForPlayer.readQuestProgressPreV13(this, src, world, fileversion);
 
 		this.baseTraits.useItemCost = src.readInt();
@@ -333,12 +333,12 @@ public final class Player extends Actor {
 				}
 			}
 		}
-		
+
 		this.availableSkillIncreases = 0;
 		if (fileversion > 21) {
 			this.availableSkillIncreases = src.readInt();
 		}
-		
+
 		if (fileversion >= 26) {
 			final int numAlignments = src.readInt();
 			for(int i = 0; i < numAlignments; ++i) {
@@ -363,7 +363,7 @@ public final class Player extends Actor {
 		dest.writeInt(baseTraits.blockChance);
 		dest.writeInt(baseTraits.damageResistance);
 		dest.writeInt(baseTraits.moveCost);
-		
+
 		ap.writeToParcel(dest, flags);
 		health.writeToParcel(dest, flags);
 		position.writeToParcel(dest, flags);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java
index 19e0256f6..9cc331e1d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropList.java
@@ -9,19 +9,19 @@ import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class DropList {
 	private final DropItem[] items;
-	
+
 	public DropList(DropItem[] items) {
 		this.items = items;
 	}
 	public void createRandomLoot(Loot loot, Player player) {
 		for (DropItem item : items) {
-			
+
 			final int chanceRollBias = SkillController.getDropChanceRollBias(item, player);
 			if (Constants.rollResult(item.chance, chanceRollBias)) {
-				
+
 				final int quantityRollBias = SkillController.getDropQuantityRollBias(item, player);
 				int quantity = Constants.rollValue(item.quantity, quantityRollBias);
-				
+
 				if (quantity != 0) {
 					if (ItemTypeCollection.isGoldItemType(item.itemType.id)) {
 						loot.gold += quantity;
@@ -37,7 +37,7 @@ public final class DropList {
 	public DropItem[] UNITTEST_getAllDropItems() {
 		return items;
 	}
-	
+
 	public static class DropItem {
 		public final ItemType itemType;
 		public final ConstRange chance;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
index 890695463..f0e428b09 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/DropListCollection.java
@@ -1,33 +1,33 @@
-package com.gpl.rpg.AndorsTrail.model.item;
-
-import java.util.HashMap;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.resource.parsers.DropListParser;
-import com.gpl.rpg.AndorsTrail.util.L;
-
-public final class DropListCollection {
-	public static final String DROPLIST_STARTITEMS = "startitems";
-	
-	private final HashMap<String, DropList> droplists = new HashMap<String, DropList>();
-	
-	public DropList getDropList(String droplistID) {
-		if (droplistID == null || droplistID.length() <= 0) return null;
-		
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-			if (!droplists.containsKey(droplistID)) {
-				L.log("WARNING: Cannot find droplist \"" + droplistID + "\".");
-			}
-		}
-		return droplists.get(droplistID);
-	}
-	
-	public void initialize(final DropListParser parser, String input) {
-		parser.parseRows(input, droplists);
-	}
-
-	// Unit test method. Not part of the game logic.
-	public HashMap<String, DropList> UNITTEST_getAllDropLists() {
-		return droplists;
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.item;
+
+import java.util.HashMap;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.DropListParser;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class DropListCollection {
+	public static final String DROPLIST_STARTITEMS = "startitems";
+
+	private final HashMap<String, DropList> droplists = new HashMap<String, DropList>();
+
+	public DropList getDropList(String droplistID) {
+		if (droplistID == null || droplistID.length() <= 0) return null;
+
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			if (!droplists.containsKey(droplistID)) {
+				L.log("WARNING: Cannot find droplist \"" + droplistID + "\".");
+			}
+		}
+		return droplists.get(droplistID);
+	}
+
+	public void initialize(final DropListParser parser, String input) {
+		parser.parseRows(input, droplists);
+	}
+
+	// Unit test method. Not part of the game logic.
+	public HashMap<String, DropList> UNITTEST_getAllDropLists() {
+		return droplists;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
index 61895b807..d31b171a8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Inventory.java
@@ -1,136 +1,136 @@
-package com.gpl.rpg.AndorsTrail.model.item;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
-
-public final class Inventory extends ItemContainer {
-
-	public static enum WearSlot {
-		weapon
-		,shield
-		,head
-		,body
-		,hand
-		,feet
-		,neck
-		,leftring
-		,rightring;
-		public static WearSlot fromString(String s, WearSlot default_) {
-			if (s == null) return default_;
-			return valueOf(s);
-		}
-	}
-
-	public int gold = 0;
-	private static final int NUM_WORN_SLOTS = WearSlot.values().length;
-	public static final int NUM_QUICK_SLOTS = 3;
-	private final ItemType[] wear = new ItemType[NUM_WORN_SLOTS];
-	public final ItemType[] quickitem = new ItemType[NUM_QUICK_SLOTS];
-	
-	public Inventory() { }
-
-	public void clear() {
-		for(int i = 0; i < NUM_WORN_SLOTS; ++i) wear[i] = null;
-		for(int i = 0; i < NUM_QUICK_SLOTS; ++i) quickitem[i] = null;
-		gold = 0;
-		items.clear();
-	}
-	
-	public void add(final Loot loot) {
-		this.gold += loot.gold;
-		this.add(loot.items);
-	}
-	
-	public boolean isEmptySlot(WearSlot slot) {
-		return wear[slot.ordinal()] == null;
-	}
-
-	public ItemType getItemTypeInWearSlot(WearSlot slot) {
-		return wear[slot.ordinal()];
-	}
-	public void setItemTypeInWearSlot(WearSlot slot, ItemType type) {
-		wear[slot.ordinal()] = type;
-	}
-
-	public boolean isWearing(String itemTypeID) {
-		for(int i = 0; i < NUM_WORN_SLOTS; ++i) {
-			if (wear[i] == null) continue;
-			if (wear[i].id.equals(itemTypeID)) return true;
-		}
-		return false;
-	}
-	
-	public static boolean isArmorSlot(WearSlot slot) {
-		if (slot == null) return false;
-		switch (slot) {
-			case head:
-			case body:
-			case hand:
-			case feet:
-				return true;
-			default:
-				return false;
-		}
-	}
-	
-	
-	// ====== PARCELABLE ===================================================================
-
-	public Inventory(DataInputStream src, WorldContext world, int fileversion) throws IOException {
-		this.readFromParcel(src, world, fileversion);
-	}
-	public void readFromParcel(DataInputStream src, WorldContext world, int fileversion) throws IOException {
-		super.readFromParcel(src, world, fileversion);
-		gold = src.readInt();
-		
-		if (fileversion < 23) LegacySavegameFormatReaderForItemContainer.refundUpgradedItems(this);
-		
-		for(int i = 0; i < NUM_WORN_SLOTS; ++i) {
-			wear[i] = null;
-		}
-		final int numWornSlots = src.readInt();
-		for(int i = 0; i < numWornSlots; ++i) {
-			if (src.readBoolean()) {
-				wear[i] = world.itemTypes.getItemType(src.readUTF());
-			}
-		}
-		for(int i = 0; i < NUM_QUICK_SLOTS; ++i) {
-			quickitem[i] = null;
-		}
-		if (fileversion >= 19) {
-			final int quickSlots = src.readInt();
-			for(int i = 0; i < quickSlots; ++i) {
-				if (src.readBoolean()) {
-					quickitem[i] = world.itemTypes.getItemType(src.readUTF());
-				}
-			}
-		}
-	}
-	
-	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
-		super.writeToParcel(dest, flags);
-		dest.writeInt(gold);
-		dest.writeInt(NUM_WORN_SLOTS);
-		for(int i = 0; i < NUM_WORN_SLOTS; ++i) {
-			if (wear[i] != null) {
-				dest.writeBoolean(true);
-				dest.writeUTF(wear[i].id);
-			} else {
-				dest.writeBoolean(false);
-			}
-		}
-		dest.writeInt(NUM_QUICK_SLOTS);
-		for(int i = 0; i < NUM_QUICK_SLOTS; ++i) {
-			if (quickitem[i] != null) {
-				dest.writeBoolean(true);
-				dest.writeUTF(quickitem[i].id);
-			} else {
-				dest.writeBoolean(false);
-			}
-		}
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.item;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForItemContainer;
+
+public final class Inventory extends ItemContainer {
+
+	public static enum WearSlot {
+		weapon
+		,shield
+		,head
+		,body
+		,hand
+		,feet
+		,neck
+		,leftring
+		,rightring;
+		public static WearSlot fromString(String s, WearSlot default_) {
+			if (s == null) return default_;
+			return valueOf(s);
+		}
+	}
+
+	public int gold = 0;
+	private static final int NUM_WORN_SLOTS = WearSlot.values().length;
+	public static final int NUM_QUICK_SLOTS = 3;
+	private final ItemType[] wear = new ItemType[NUM_WORN_SLOTS];
+	public final ItemType[] quickitem = new ItemType[NUM_QUICK_SLOTS];
+
+	public Inventory() { }
+
+	public void clear() {
+		for(int i = 0; i < NUM_WORN_SLOTS; ++i) wear[i] = null;
+		for(int i = 0; i < NUM_QUICK_SLOTS; ++i) quickitem[i] = null;
+		gold = 0;
+		items.clear();
+	}
+
+	public void add(final Loot loot) {
+		this.gold += loot.gold;
+		this.add(loot.items);
+	}
+
+	public boolean isEmptySlot(WearSlot slot) {
+		return wear[slot.ordinal()] == null;
+	}
+
+	public ItemType getItemTypeInWearSlot(WearSlot slot) {
+		return wear[slot.ordinal()];
+	}
+	public void setItemTypeInWearSlot(WearSlot slot, ItemType type) {
+		wear[slot.ordinal()] = type;
+	}
+
+	public boolean isWearing(String itemTypeID) {
+		for(int i = 0; i < NUM_WORN_SLOTS; ++i) {
+			if (wear[i] == null) continue;
+			if (wear[i].id.equals(itemTypeID)) return true;
+		}
+		return false;
+	}
+
+	public static boolean isArmorSlot(WearSlot slot) {
+		if (slot == null) return false;
+		switch (slot) {
+			case head:
+			case body:
+			case hand:
+			case feet:
+				return true;
+			default:
+				return false;
+		}
+	}
+
+
+	// ====== PARCELABLE ===================================================================
+
+	public Inventory(DataInputStream src, WorldContext world, int fileversion) throws IOException {
+		this.readFromParcel(src, world, fileversion);
+	}
+	public void readFromParcel(DataInputStream src, WorldContext world, int fileversion) throws IOException {
+		super.readFromParcel(src, world, fileversion);
+		gold = src.readInt();
+
+		if (fileversion < 23) LegacySavegameFormatReaderForItemContainer.refundUpgradedItems(this);
+
+		for(int i = 0; i < NUM_WORN_SLOTS; ++i) {
+			wear[i] = null;
+		}
+		final int numWornSlots = src.readInt();
+		for(int i = 0; i < numWornSlots; ++i) {
+			if (src.readBoolean()) {
+				wear[i] = world.itemTypes.getItemType(src.readUTF());
+			}
+		}
+		for(int i = 0; i < NUM_QUICK_SLOTS; ++i) {
+			quickitem[i] = null;
+		}
+		if (fileversion >= 19) {
+			final int quickSlots = src.readInt();
+			for(int i = 0; i < quickSlots; ++i) {
+				if (src.readBoolean()) {
+					quickitem[i] = world.itemTypes.getItemType(src.readUTF());
+				}
+			}
+		}
+	}
+
+	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
+		super.writeToParcel(dest, flags);
+		dest.writeInt(gold);
+		dest.writeInt(NUM_WORN_SLOTS);
+		for(int i = 0; i < NUM_WORN_SLOTS; ++i) {
+			if (wear[i] != null) {
+				dest.writeBoolean(true);
+				dest.writeUTF(wear[i].id);
+			} else {
+				dest.writeBoolean(false);
+			}
+		}
+		dest.writeInt(NUM_QUICK_SLOTS);
+		for(int i = 0; i < NUM_QUICK_SLOTS; ++i) {
+			if (quickitem[i] != null) {
+				dest.writeBoolean(true);
+				dest.writeUTF(quickitem[i].id);
+			} else {
+				dest.writeBoolean(false);
+			}
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategory.java
index e26d3b10b..e6be545d8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategory.java
@@ -16,7 +16,7 @@ public final class ItemCategory {
 	public final Inventory.WearSlot inventorySlot;
 	private final ActionType actionType;
 	private final ItemCategorySize size;
-	
+
 	public ItemCategory(
 			String id
 			, String displayName
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java
index 38d67d116..ea52eb460 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemCategoryCollection.java
@@ -1,30 +1,29 @@
-package com.gpl.rpg.AndorsTrail.model.item;
-
-import java.util.HashMap;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.resource.parsers.ItemCategoryParser;
-import com.gpl.rpg.AndorsTrail.util.L;
-
-public final class ItemCategoryCollection {
-	private final HashMap<String, ItemCategory> itemCategories = new HashMap<String, ItemCategory>();
-	
-	public ItemCategory getItemCategory(String id) {
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-			if (!itemCategories.containsKey(id)) {
-				L.log("WARNING: Cannot find ItemCategory for id \"" + id + "\".");
-			}
-		}
-		return itemCategories.get(id);
-	}
-	
-	public void initialize(final ItemCategoryParser parser, String input) {
-		parser.parseRows(input, itemCategories);
-	}
-
-	// Unit test method. Not part of the game logic.
-	public HashMap<String, ItemCategory> UNITTEST_getAllItemCategories() {
-		return itemCategories;
-	}
-}
-  
\ No newline at end of file
+package com.gpl.rpg.AndorsTrail.model.item;
+
+import java.util.HashMap;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ItemCategoryParser;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class ItemCategoryCollection {
+	private final HashMap<String, ItemCategory> itemCategories = new HashMap<String, ItemCategory>();
+
+	public ItemCategory getItemCategory(String id) {
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			if (!itemCategories.containsKey(id)) {
+				L.log("WARNING: Cannot find ItemCategory for id \"" + id + "\".");
+			}
+		}
+		return itemCategories.get(id);
+	}
+
+	public void initialize(final ItemCategoryParser parser, String input) {
+		parser.parseRows(input, itemCategories);
+	}
+
+	// Unit test method. Not part of the game logic.
+	public HashMap<String, ItemCategory> UNITTEST_getAllItemCategories() {
+		return itemCategories;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
index 188a328fd..f4606547c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemContainer.java
@@ -1,139 +1,139 @@
-package com.gpl.rpg.AndorsTrail.model.item;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-
-public class ItemContainer {
-	public final ArrayList<ItemEntry> items = new ArrayList<ItemEntry>();
-	
-	public ItemContainer() {}
-	
-	public int countItems() {
-		int result = 0;
-		for (ItemEntry i : items) {
-			result += i.quantity;
-		}
-		return result;
-	}
-	
-	public static final class ItemEntry {
-		public final ItemType itemType;
-		public int quantity;
-		public ItemEntry(ItemType itemType, int initialQuantity) {
-			this.itemType = itemType;
-			this.quantity = initialQuantity;
-		}
-		
-		// ====== PARCELABLE ===================================================================
-
-		public ItemEntry(DataInputStream src, WorldContext world, int fileversion) throws IOException {
-			this.itemType = world.itemTypes.getItemType(src.readUTF()); 
-			this.quantity = src.readInt();
-		}
-		
-		public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
-			dest.writeUTF(itemType.id);
-			dest.writeInt(quantity);
-		}
-	}
-	
-	public void addItem(ItemType itemType, int quantity) {
-		ItemEntry e = findItem(itemType.id);
-		if (e != null) {
-			e.quantity += quantity;
-		} else {
-			items.add(new ItemEntry(itemType, quantity));
-		}
-	}
-	public void addItem(ItemType itemType) { addItem(itemType, 1); }
-	public void add(final ItemContainer items) {
-		for (ItemEntry e : items.items) {
-			addItem(e.itemType, e.quantity);
-		}
-	}
-	public boolean isEmpty() { return items.isEmpty(); }
-	
-	public boolean removeItem(String itemTypeID) { return removeItem(itemTypeID, 1); }
-	public boolean removeItem(String itemTypeID, int quantity) {
-		int index = -1;
-		ItemEntry e = null;
-		for (int i = 0; i < items.size(); ++i) {
-			e = items.get(i);
-			if (e.itemType.id.equals(itemTypeID)) {
-				index = i;
-				break;
-			}
-		}
-		if (index < 0) return false;
-		if (e.quantity == quantity) {
-			items.remove(index);
-		} else if (e.quantity > quantity) {
-			e.quantity -= quantity;
-		} else {
-			return false;
-		}
-		return true;
-	}
-	
-	public ItemEntry findItem(String itemTypeID) {
-		for (ItemEntry e : items) {
-			if (e.itemType.id.equals(itemTypeID)) return e;
-		}
-		return null;
-	}
-	public int findItemIndex(String itemTypeID) {
-		for (int i = 0; i < items.size(); ++i) {
-			if (items.get(i).itemType.id.equals(itemTypeID)) return i;
-		}
-		return -1;
-	}
-	public boolean hasItem(String itemTypeID) { return findItem(itemTypeID) != null; }
-	public boolean hasItem(String itemTypeID, int minimumQuantity) { 
-		return getItemQuantity(itemTypeID) >= minimumQuantity;
-	}
-	
-	public int getItemQuantity(String itemTypeID) { 
-		ItemEntry e = findItem(itemTypeID);
-		if (e == null) return 0;
-		return e.quantity;
-	}
-
-	public void sortToTop(String itemTypeID) {
-		int i = findItemIndex(itemTypeID);
-		if (i <= 0) return;
-		items.add(0, items.remove(i));
-	}
-
-	public void sortToBottom(String itemTypeID) {
-		int i = findItemIndex(itemTypeID);
-		if (i < 0) return;
-		items.add(items.remove(i));
-	}
-	
-	
-	// ====== PARCELABLE ===================================================================
-
-	public ItemContainer(DataInputStream src, WorldContext world, int fileversion) throws IOException {
-		readFromParcel(src, world, fileversion);
-	}
-	
-	public void readFromParcel(DataInputStream src, WorldContext world, int fileversion) throws IOException {
-		items.clear();
-		final int size = src.readInt();
-		for(int i = 0; i < size; ++i) {
-			ItemEntry entry = new ItemEntry(src, world, fileversion);
-			if (entry.itemType != null) items.add(entry);
-		}
-	}
-	
-	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
-		dest.writeInt(items.size());
-		for (ItemEntry e : items) {
-			e.writeToParcel(dest, flags);
-		}
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.item;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+
+public class ItemContainer {
+	public final ArrayList<ItemEntry> items = new ArrayList<ItemEntry>();
+
+	public ItemContainer() {}
+
+	public int countItems() {
+		int result = 0;
+		for (ItemEntry i : items) {
+			result += i.quantity;
+		}
+		return result;
+	}
+
+	public static final class ItemEntry {
+		public final ItemType itemType;
+		public int quantity;
+		public ItemEntry(ItemType itemType, int initialQuantity) {
+			this.itemType = itemType;
+			this.quantity = initialQuantity;
+		}
+
+		// ====== PARCELABLE ===================================================================
+
+		public ItemEntry(DataInputStream src, WorldContext world, int fileversion) throws IOException {
+			this.itemType = world.itemTypes.getItemType(src.readUTF());
+			this.quantity = src.readInt();
+		}
+
+		public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
+			dest.writeUTF(itemType.id);
+			dest.writeInt(quantity);
+		}
+	}
+
+	public void addItem(ItemType itemType, int quantity) {
+		ItemEntry e = findItem(itemType.id);
+		if (e != null) {
+			e.quantity += quantity;
+		} else {
+			items.add(new ItemEntry(itemType, quantity));
+		}
+	}
+	public void addItem(ItemType itemType) { addItem(itemType, 1); }
+	public void add(final ItemContainer items) {
+		for (ItemEntry e : items.items) {
+			addItem(e.itemType, e.quantity);
+		}
+	}
+	public boolean isEmpty() { return items.isEmpty(); }
+
+	public boolean removeItem(String itemTypeID) { return removeItem(itemTypeID, 1); }
+	public boolean removeItem(String itemTypeID, int quantity) {
+		int index = -1;
+		ItemEntry e = null;
+		for (int i = 0; i < items.size(); ++i) {
+			e = items.get(i);
+			if (e.itemType.id.equals(itemTypeID)) {
+				index = i;
+				break;
+			}
+		}
+		if (index < 0) return false;
+		if (e.quantity == quantity) {
+			items.remove(index);
+		} else if (e.quantity > quantity) {
+			e.quantity -= quantity;
+		} else {
+			return false;
+		}
+		return true;
+	}
+
+	public ItemEntry findItem(String itemTypeID) {
+		for (ItemEntry e : items) {
+			if (e.itemType.id.equals(itemTypeID)) return e;
+		}
+		return null;
+	}
+	public int findItemIndex(String itemTypeID) {
+		for (int i = 0; i < items.size(); ++i) {
+			if (items.get(i).itemType.id.equals(itemTypeID)) return i;
+		}
+		return -1;
+	}
+	public boolean hasItem(String itemTypeID) { return findItem(itemTypeID) != null; }
+	public boolean hasItem(String itemTypeID, int minimumQuantity) {
+		return getItemQuantity(itemTypeID) >= minimumQuantity;
+	}
+
+	public int getItemQuantity(String itemTypeID) {
+		ItemEntry e = findItem(itemTypeID);
+		if (e == null) return 0;
+		return e.quantity;
+	}
+
+	public void sortToTop(String itemTypeID) {
+		int i = findItemIndex(itemTypeID);
+		if (i <= 0) return;
+		items.add(0, items.remove(i));
+	}
+
+	public void sortToBottom(String itemTypeID) {
+		int i = findItemIndex(itemTypeID);
+		if (i < 0) return;
+		items.add(items.remove(i));
+	}
+
+
+	// ====== PARCELABLE ===================================================================
+
+	public ItemContainer(DataInputStream src, WorldContext world, int fileversion) throws IOException {
+		readFromParcel(src, world, fileversion);
+	}
+
+	public void readFromParcel(DataInputStream src, WorldContext world, int fileversion) throws IOException {
+		items.clear();
+		final int size = src.readInt();
+		for(int i = 0; i < size; ++i) {
+			ItemEntry entry = new ItemEntry(src, world, fileversion);
+			if (entry.itemType != null) items.add(entry);
+		}
+	}
+
+	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
+		dest.writeInt(items.size());
+		for (ItemEntry e : items) {
+			e.writeToParcel(dest, flags);
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnEquip.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnEquip.java
index a7c5ee7b5..13f77a7c7 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnEquip.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnEquip.java
@@ -6,9 +6,9 @@ import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
 public final class ItemTraits_OnEquip {
 	public final AbilityModifierTraits stats;
 	public final ActorConditionEffect[] addedConditions;
-	
+
 	public ItemTraits_OnEquip(
-			AbilityModifierTraits stats, 
+			AbilityModifierTraits stats,
 			ActorConditionEffect[] addedConditions) {
 		this.stats = stats;
 		this.addedConditions = addedConditions;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnUse.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnUse.java
index 2c2d9654a..c52712531 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnUse.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTraits_OnUse.java
@@ -7,7 +7,7 @@ public final class ItemTraits_OnUse {
 	public final StatsModifierTraits changedStats;
 	public final ActorConditionEffect[] addedConditions_source;
 	public final ActorConditionEffect[] addedConditions_target;
-	
+
 	public ItemTraits_OnUse(StatsModifierTraits changedStats, ActorConditionEffect[] addedConditions_source, ActorConditionEffect[] addedConditions_target) {
 		this.changedStats = changedStats;
 		this.addedConditions_source = addedConditions_source;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
index 7ec9dda65..42307b66c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemType.java
@@ -1,109 +1,109 @@
-package com.gpl.rpg.AndorsTrail.model.item;
-
-import com.gpl.rpg.AndorsTrail.controller.Constants;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
-
-public final class ItemType {
-
-	public static enum DisplayType {
-		ordinary
-		,quest
-		,legendary
-		,extraordinary
-		,rare;
-
-		public static DisplayType fromString(String s, DisplayType default_) {
-			if (s == null) return default_;
-			return valueOf(s);
-		}
-	}
-
-	public final String id;
-	public final int iconID;
-	private final String name;
-	private final String description;
-	private final boolean hasPersonalizedName;
-	public final ItemCategory category;
-	public final boolean hasManualPrice;
-	public final int baseMarketCost;
-	public final int fixedBaseMarketCost;
-	public final DisplayType displayType;
-	
-	public final ItemTraits_OnEquip effects_equip;
-	public final ItemTraits_OnUse effects_use;
-	public final ItemTraits_OnUse effects_hit;
-	public final ItemTraits_OnUse effects_kill;
-
-	public ItemType(
-			String id, 
-			int iconID, 
-			String name, 
-			String description,
-			ItemCategory category,
-			DisplayType displayType,
-			boolean hasManualPrice, 
-			int fixedBaseMarketCost, 
-			ItemTraits_OnEquip effects_equip, 
-			ItemTraits_OnUse effects_use, 
-			ItemTraits_OnUse effects_hit, 
-			ItemTraits_OnUse effects_kill) {
-		this.id = id;
-		this.iconID = iconID;
-		this.name = name;
-		this.description = description;
-		this.category = category;
-		this.displayType = displayType;
-		this.hasManualPrice = hasManualPrice;
-		this.baseMarketCost = hasManualPrice ? fixedBaseMarketCost : calculateCost(category, effects_equip, effects_use, effects_hit, effects_kill);
-		this.fixedBaseMarketCost = fixedBaseMarketCost;
-		this.effects_equip = effects_equip;
-		this.effects_use = effects_use;
-		this.effects_hit = effects_hit;
-		this.effects_kill = effects_kill;
-		this.hasPersonalizedName = name.contains(Constants.PLACEHOLDER_PLAYERNAME);
-	}
-	
-	public boolean isEquippable() { return category.isEquippable(); }
-	public boolean isUsable() { return category.isUsable(); }
-	public boolean isQuestItem() { return displayType == DisplayType.quest; }
-	public boolean isOrdinaryItem() { return displayType == DisplayType.ordinary; }
-	public boolean isWeapon() { return category.isWeapon(); }
-	public boolean isArmor() { return category.isArmor(); }
-	public boolean isShield() { return category.isShield(); }
-	public boolean isTwohandWeapon() { return category.isTwohandWeapon(); }
-	public boolean isOffhandCapableWeapon() { return category.isOffhandCapableWeapon(); }
-	public boolean isSellable() {
-		if (isQuestItem()) return false;
-		if (baseMarketCost == 0) return false;
-		return true;
-	}
-
-    public String getDescription() { return description; }
-    public String getName(Player p) {
-		if (!hasPersonalizedName) return name;
-		else return name.replace(Constants.PLACEHOLDER_PLAYERNAME, p.getName());		
-	}
-
-    public int getOverlayTileID() {
-		switch (displayType) {
-		case quest:
-			return TileManager.iconID_selection_yellow;
-		case legendary:
-			return TileManager.iconID_selection_green;
-		case extraordinary:
-			return TileManager.iconID_selection_blue;
-		case rare:
-			return TileManager.iconID_selection_purple;
-		}
-		return -1;
-	}
-
-    private static int calculateCost(ItemCategory category, ItemTraits_OnEquip effects_equip, ItemTraits_OnUse effects_use, ItemTraits_OnUse effects_hit, ItemTraits_OnUse effects_kill) {
-		final int costEquipStats = effects_equip == null ? 0 : effects_equip.calculateEquipCost(category.isWeapon());
-		final int costUse = effects_use == null ? 0 : effects_use.calculateUseCost();
-		final int costHit = effects_hit == null ? 0 : effects_hit.calculateHitCost();
-		final int costKill = effects_kill == null ? 0 : effects_kill.calculateKillCost();
-		return Math.max(1, costEquipStats + costUse + costHit + costKill);
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.item;
+
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+
+public final class ItemType {
+
+	public static enum DisplayType {
+		ordinary
+		,quest
+		,legendary
+		,extraordinary
+		,rare;
+
+		public static DisplayType fromString(String s, DisplayType default_) {
+			if (s == null) return default_;
+			return valueOf(s);
+		}
+	}
+
+	public final String id;
+	public final int iconID;
+	private final String name;
+	private final String description;
+	private final boolean hasPersonalizedName;
+	public final ItemCategory category;
+	public final boolean hasManualPrice;
+	public final int baseMarketCost;
+	public final int fixedBaseMarketCost;
+	public final DisplayType displayType;
+
+	public final ItemTraits_OnEquip effects_equip;
+	public final ItemTraits_OnUse effects_use;
+	public final ItemTraits_OnUse effects_hit;
+	public final ItemTraits_OnUse effects_kill;
+
+	public ItemType(
+			String id,
+			int iconID,
+			String name,
+			String description,
+			ItemCategory category,
+			DisplayType displayType,
+			boolean hasManualPrice,
+			int fixedBaseMarketCost,
+			ItemTraits_OnEquip effects_equip,
+			ItemTraits_OnUse effects_use,
+			ItemTraits_OnUse effects_hit,
+			ItemTraits_OnUse effects_kill) {
+		this.id = id;
+		this.iconID = iconID;
+		this.name = name;
+		this.description = description;
+		this.category = category;
+		this.displayType = displayType;
+		this.hasManualPrice = hasManualPrice;
+		this.baseMarketCost = hasManualPrice ? fixedBaseMarketCost : calculateCost(category, effects_equip, effects_use, effects_hit, effects_kill);
+		this.fixedBaseMarketCost = fixedBaseMarketCost;
+		this.effects_equip = effects_equip;
+		this.effects_use = effects_use;
+		this.effects_hit = effects_hit;
+		this.effects_kill = effects_kill;
+		this.hasPersonalizedName = name.contains(Constants.PLACEHOLDER_PLAYERNAME);
+	}
+
+	public boolean isEquippable() { return category.isEquippable(); }
+	public boolean isUsable() { return category.isUsable(); }
+	public boolean isQuestItem() { return displayType == DisplayType.quest; }
+	public boolean isOrdinaryItem() { return displayType == DisplayType.ordinary; }
+	public boolean isWeapon() { return category.isWeapon(); }
+	public boolean isArmor() { return category.isArmor(); }
+	public boolean isShield() { return category.isShield(); }
+	public boolean isTwohandWeapon() { return category.isTwohandWeapon(); }
+	public boolean isOffhandCapableWeapon() { return category.isOffhandCapableWeapon(); }
+	public boolean isSellable() {
+		if (isQuestItem()) return false;
+		if (baseMarketCost == 0) return false;
+		return true;
+	}
+
+	public String getDescription() { return description; }
+	public String getName(Player p) {
+		if (!hasPersonalizedName) return name;
+		else return name.replace(Constants.PLACEHOLDER_PLAYERNAME, p.getName());
+	}
+
+	public int getOverlayTileID() {
+		switch (displayType) {
+		case quest:
+			return TileManager.iconID_selection_yellow;
+		case legendary:
+			return TileManager.iconID_selection_green;
+		case extraordinary:
+			return TileManager.iconID_selection_blue;
+		case rare:
+			return TileManager.iconID_selection_purple;
+		}
+		return -1;
+	}
+
+	private static int calculateCost(ItemCategory category, ItemTraits_OnEquip effects_equip, ItemTraits_OnUse effects_use, ItemTraits_OnUse effects_hit, ItemTraits_OnUse effects_kill) {
+		final int costEquipStats = effects_equip == null ? 0 : effects_equip.calculateEquipCost(category.isWeapon());
+		final int costUse = effects_use == null ? 0 : effects_use.calculateUseCost();
+		final int costHit = effects_hit == null ? 0 : effects_hit.calculateHitCost();
+		final int costKill = effects_kill == null ? 0 : effects_kill.calculateKillCost();
+		return Math.max(1, costEquipStats + costUse + costHit + costKill);
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
index 046d03817..9a6d6324f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/ItemTypeCollection.java
@@ -1,38 +1,37 @@
-package com.gpl.rpg.AndorsTrail.model.item;
-
-import java.util.HashMap;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.resource.parsers.ItemTypeParser;
-import com.gpl.rpg.AndorsTrail.util.L;
-
-public final class ItemTypeCollection {
-	private static final String ITEMTYPE_GOLD = "gold";
-	
-	private final HashMap<String, ItemType> itemTypes = new HashMap<String, ItemType>();
-	
-	public ItemType getItemType(String id) {
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-			if (!itemTypes.containsKey(id)) {
-				L.log("WARNING: Cannot find ItemType for id \"" + id + "\".");
-				return null;
-			}
-		}
-		return itemTypes.get(id);
-	}
-
-	public static boolean isGoldItemType(String itemTypeID) {
-		if (itemTypeID == null) return false;
-		return itemTypeID.equals(ITEMTYPE_GOLD);
-	}
-	
-	public void initialize(final ItemTypeParser parser, String input) {
-		parser.parseRows(input, itemTypes);
-	}
-
-	// Unit test method. Not part of the game logic.
-	public HashMap<String, ItemType> UNITTEST_getAllItemTypes() {
-		return itemTypes;
-	}
-}
-  
\ No newline at end of file
+package com.gpl.rpg.AndorsTrail.model.item;
+
+import java.util.HashMap;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ItemTypeParser;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class ItemTypeCollection {
+	private static final String ITEMTYPE_GOLD = "gold";
+
+	private final HashMap<String, ItemType> itemTypes = new HashMap<String, ItemType>();
+
+	public ItemType getItemType(String id) {
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			if (!itemTypes.containsKey(id)) {
+				L.log("WARNING: Cannot find ItemType for id \"" + id + "\".");
+				return null;
+			}
+		}
+		return itemTypes.get(id);
+	}
+
+	public static boolean isGoldItemType(String itemTypeID) {
+		if (itemTypeID == null) return false;
+		return itemTypeID.equals(ITEMTYPE_GOLD);
+	}
+
+	public void initialize(final ItemTypeParser parser, String input) {
+		parser.parseRows(input, itemTypes);
+	}
+
+	// Unit test method. Not part of the game logic.
+	public HashMap<String, ItemType> UNITTEST_getAllItemTypes() {
+		return itemTypes;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java
index 2cc8d6340..a603c08ab 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/item/Loot.java
@@ -15,7 +15,7 @@ public final class Loot {
 	public final ItemContainer items;
 	public final Coord position;
 	public final boolean isVisible;
-	
+
 	public Loot() {
 		this.items = new ItemContainer();
 		this.position = new Coord();
@@ -27,12 +27,12 @@ public final class Loot {
 		this.isVisible = isVisible;
 	}
 
-    private void add(Loot l) {
+	private void add(Loot l) {
 		this.exp += l.exp;
 		this.gold += l.gold;
 		this.items.add(l.items);
 	}
-	
+
 	public boolean hasItemsOrExp() {
 		return exp != 0 || hasItemsOrGold();
 	}
@@ -67,8 +67,8 @@ public final class Loot {
 		gold = 0;
 		items.items.clear();
 	}
-	
-	
+
+
 	// ====== PARCELABLE ===================================================================
 
 	public Loot(DataInputStream src, WorldContext world, int fileversion) throws IOException {
@@ -76,7 +76,7 @@ public final class Loot {
 		this.gold = src.readInt();
 		this.items = new ItemContainer(src, world, fileversion);
 		if (fileversion < 23) LegacySavegameFormatReaderForItemContainer.refundUpgradedItems(this);
-		
+
 		this.position = new Coord(src, fileversion);
 		if (fileversion <= 15) {
 			this.isVisible = true;
@@ -84,7 +84,7 @@ public final class Loot {
 		}
 		this.isVisible = src.readBoolean();
 	}
-	
+
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
 		dest.writeInt(exp);
 		dest.writeInt(gold);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListeners.java
index 5bc5df40c..5eb62fb77 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorConditionListeners.java
@@ -21,7 +21,7 @@ public final class ActorConditionListeners extends ListOfListeners<ActorConditio
 	private final Function2<ActorConditionListener, Actor, ActorCondition> onActorConditionRoundEffectApplied = new Function2<ActorConditionListener, Actor, ActorCondition>() {
 		@Override public void call(ActorConditionListener listener, Actor actor, ActorCondition condition) { listener.onActorConditionRoundEffectApplied(actor, condition); }
 	};
-	
+
 	@Override
 	public void onActorConditionAdded(Actor actor, ActorCondition condition) {
 		callAllListeners(this.onActorConditionAdded, actor, condition);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListeners.java
index cb8318005..bf8fec790 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/ActorStatsListeners.java
@@ -8,11 +8,11 @@ public final class ActorStatsListeners extends ListOfListeners<ActorStatsListene
 	private final Function1<ActorStatsListener, Actor> onActorHealthChanged = new Function1<ActorStatsListener, Actor>() {
 		@Override public void call(ActorStatsListener listener, Actor actor) { listener.onActorHealthChanged(actor); }
 	};
-	
+
 	private final Function1<ActorStatsListener, Actor> onActorAPChanged = new Function1<ActorStatsListener, Actor>() {
 		@Override public void call(ActorStatsListener listener, Actor actor) { listener.onActorAPChanged(actor); }
 	};
-	
+
 	private final Function2<ActorStatsListener, Actor, Integer> onActorAttackCostChanged = new Function2<ActorStatsListener, Actor, Integer>() {
 		@Override public void call(ActorStatsListener listener, Actor actor, Integer newAttackCost) { listener.onActorAttackCostChanged(actor, newAttackCost); }
 	};
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListeners.java
index 99b09df2e..a11b7eb7d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/listeners/PlayerStatsListeners.java
@@ -4,11 +4,11 @@ import com.gpl.rpg.AndorsTrail.model.actor.Player;
 import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class PlayerStatsListeners extends ListOfListeners<PlayerStatsListener> implements PlayerStatsListener {
-	
+
 	private final Function1<PlayerStatsListener, Player> onPlayerExperienceChanged = new Function1<PlayerStatsListener, Player>() {
 		@Override public void call(PlayerStatsListener listener, Player p) { listener.onPlayerExperienceChanged(p); }
 	};
-	
+
 	@Override
 	public void onPlayerExperienceChanged(Player p) {
 		callAllListeners(this.onPlayerExperienceChanged, p);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
index 86ee8d55c..e2d4a499a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/LayeredTileMap.java
@@ -84,9 +84,9 @@ public final class LayeredTileMap {
 	private static ColorMatrixColorFilter createGrayScaleColorFilter(float blackOpacity) {
 		final float f = blackOpacity;
 		return new ColorMatrixColorFilter(new float[] {
-			f,     0.00f, 0.00f, 0.0f, 0.0f,
-			0.00f, f,     0.00f, 0.0f, 0.0f,
-			0.00f, 0.00f, f,     0.0f, 0.0f,
+			f,	 0.00f, 0.00f, 0.0f, 0.0f,
+			0.00f, f,	 0.00f, 0.0f, 0.0f,
+			0.00f, 0.00f, f,	 0.0f, 0.0f,
 			0.00f, 0.00f, 0.00f, 1.0f, 0.0f
 		});
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
index 400681f83..c8b3aa233 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapCollection.java
@@ -1,102 +1,102 @@
-package com.gpl.rpg.AndorsTrail.model.map;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail.context.WorldContext;
-import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForMap;
-import com.gpl.rpg.AndorsTrail.util.L;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-
-public final class MapCollection {
-	private final HashMap<String, PredefinedMap> predefinedMaps = new HashMap<String, PredefinedMap>();
-	public final HashMap<String, WorldMapSegment> worldMapSegments = new HashMap<String, WorldMapSegment>();
-	public boolean worldMapRequiresUpdate = true;
-
-	public MapCollection() {}
-
-	public void addAll(ArrayList<PredefinedMap> mapsToAdd) {
-		for (PredefinedMap map : mapsToAdd) {
-			predefinedMaps.put(map.name, map);
-		}
-	}
-
-	public Collection<PredefinedMap> getAllMaps() {
-		return predefinedMaps.values();
-	}
-
-	public PredefinedMap findPredefinedMap(String name) {
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-			if (!predefinedMaps.containsKey(name)) {
-				L.log("WARNING: Cannot find PredefinedMap for name \"" + name + "\".");
-			}
-		}
-		return predefinedMaps.get(name);
-    }
-
-	public void reset() {
-		for (PredefinedMap m : getAllMaps()) {
-    		m.reset();
-    	}
-		worldMapRequiresUpdate = true;
-	}
-	
-	public String getWorldMapSegmentNameForMap(String mapName) {
-		for (WorldMapSegment segment : worldMapSegments.values()) {
-			if (segment.containsMap(mapName)) return segment.name;
-		}
-		return null;
-	}
-
-
-	// ====== PARCELABLE ===================================================================
-
-	public void readFromParcel(DataInputStream src, WorldContext world, ControllerContext controllers, int fileversion) throws IOException {
-		int size;
-		if (fileversion == 5) size = 11;
-		else size = src.readInt();
-		for(int i = 0; i < size; ++i) {
-			String name;
-			if (fileversion >= 35) {
-				name = src.readUTF();
-			} else {
-				name = LegacySavegameFormatReaderForMap.getMapnameFromIndex(i);
-			}
-			PredefinedMap map = predefinedMaps.get(name);
-			if (map == null) {
-				if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-					L.log("WARNING: Tried to load savegame with map \"" + name + "\", but no such map exists.");
-				}
-				continue;
-			}
-			map.readFromParcel(src, world, controllers, fileversion);
-			if (i >= 40) {
-				if (fileversion < 15) map.visited = false;
-			}
-		}
-	}
-
-	private static boolean shouldSaveMap(WorldContext world, PredefinedMap map) {
-		if (map.visited) return true;
-		if (map == world.model.currentMap) return true;
-		return false;
-	}
-
-	public void writeToParcel(DataOutputStream dest, WorldContext world, int flags) throws IOException {
-		List<PredefinedMap> mapsToExport = new ArrayList<PredefinedMap>();
-		for(PredefinedMap map : getAllMaps()) {
-			if (shouldSaveMap(world, map)) mapsToExport.add(map);
-		}
-		dest.writeInt(mapsToExport.size());
-		for(PredefinedMap map : mapsToExport) {
-			dest.writeUTF(map.name);
-			map.writeToParcel(dest, world, flags);
-		}
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.map;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.savegames.LegacySavegameFormatReaderForMap;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+
+public final class MapCollection {
+	private final HashMap<String, PredefinedMap> predefinedMaps = new HashMap<String, PredefinedMap>();
+	public final HashMap<String, WorldMapSegment> worldMapSegments = new HashMap<String, WorldMapSegment>();
+	public boolean worldMapRequiresUpdate = true;
+
+	public MapCollection() {}
+
+	public void addAll(ArrayList<PredefinedMap> mapsToAdd) {
+		for (PredefinedMap map : mapsToAdd) {
+			predefinedMaps.put(map.name, map);
+		}
+	}
+
+	public Collection<PredefinedMap> getAllMaps() {
+		return predefinedMaps.values();
+	}
+
+	public PredefinedMap findPredefinedMap(String name) {
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			if (!predefinedMaps.containsKey(name)) {
+				L.log("WARNING: Cannot find PredefinedMap for name \"" + name + "\".");
+			}
+		}
+		return predefinedMaps.get(name);
+	}
+
+	public void reset() {
+		for (PredefinedMap m : getAllMaps()) {
+			m.reset();
+		}
+		worldMapRequiresUpdate = true;
+	}
+
+	public String getWorldMapSegmentNameForMap(String mapName) {
+		for (WorldMapSegment segment : worldMapSegments.values()) {
+			if (segment.containsMap(mapName)) return segment.name;
+		}
+		return null;
+	}
+
+
+	// ====== PARCELABLE ===================================================================
+
+	public void readFromParcel(DataInputStream src, WorldContext world, ControllerContext controllers, int fileversion) throws IOException {
+		int size;
+		if (fileversion == 5) size = 11;
+		else size = src.readInt();
+		for(int i = 0; i < size; ++i) {
+			String name;
+			if (fileversion >= 35) {
+				name = src.readUTF();
+			} else {
+				name = LegacySavegameFormatReaderForMap.getMapnameFromIndex(i);
+			}
+			PredefinedMap map = predefinedMaps.get(name);
+			if (map == null) {
+				if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+					L.log("WARNING: Tried to load savegame with map \"" + name + "\", but no such map exists.");
+				}
+				continue;
+			}
+			map.readFromParcel(src, world, controllers, fileversion);
+			if (i >= 40) {
+				if (fileversion < 15) map.visited = false;
+			}
+		}
+	}
+
+	private static boolean shouldSaveMap(WorldContext world, PredefinedMap map) {
+		if (map.visited) return true;
+		if (map == world.model.currentMap) return true;
+		return false;
+	}
+
+	public void writeToParcel(DataOutputStream dest, WorldContext world, int flags) throws IOException {
+		List<PredefinedMap> mapsToExport = new ArrayList<PredefinedMap>();
+		for(PredefinedMap map : getAllMaps()) {
+			if (shouldSaveMap(world, map)) mapsToExport.add(map);
+		}
+		dest.writeInt(mapsToExport.size());
+		for(PredefinedMap map : mapsToExport) {
+			dest.writeUTF(map.name);
+			map.writeToParcel(dest, world, flags);
+		}
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java
index 0d2dbfa98..b63a6659d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapLayer.java
@@ -5,11 +5,11 @@ import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class MapLayer {
 	public final int[][] tiles;
-	
+
 	public MapLayer(Size size) {
 		tiles = new int[size.width][size.height];
 	}
 	public void setTile(int type, int x, int y) {
 		tiles[x][y] = type;
-    }
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
index 6ae6764b6..4c48f296f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MapObject.java
@@ -20,7 +20,7 @@ public final class MapObject {
 	public final String place;
 	public final QuestProgress requireQuestProgress;
 	public final DropList dropList;
-	
+
 	private MapObject(
 			final CoordRect position
 			, final MapObjectType type
@@ -37,7 +37,7 @@ public final class MapObject {
 		this.requireQuestProgress = requireQuestProgress;
 		this.dropList = dropList;
 	}
-	
+
 	public static MapObject createMapSignEvent(final CoordRect position, final String phraseID) {
 		return new MapObject(position, MapObjectType.sign, phraseID, null, null, null, null);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
index 0d7100e59..c876c378e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/MonsterSpawnArea.java
@@ -20,7 +20,7 @@ public final class MonsterSpawnArea {
 	public final String[] monsterTypeIDs;
 	public final ArrayList<Monster> monsters = new ArrayList<Monster>();
 	public final boolean isUnique; // unique == non-respawnable
-	
+
 	public MonsterSpawnArea(CoordRect area, Range quantity, Range spawnChance, String[] monsterTypeIDs, boolean isUnique) {
 		this.area = area;
 		this.quantity = quantity;
@@ -61,11 +61,11 @@ public final class MonsterSpawnArea {
 		quantity.current++;
 		return m;
 	}
-	
+
 	public void remove(Monster m) {
 		if (monsters.remove(m)) quantity.current--;
 	}
-	
+
 	public boolean isSpawnable(boolean includeUniqueMonsters) {
 		if (isUnique && !includeUniqueMonsters) return false;
 		return quantity.current < quantity.max;
@@ -85,8 +85,8 @@ public final class MonsterSpawnArea {
 			m.resetShopItems();
 		}
 	}
-	
-	
+
+
 	// ====== PARCELABLE ===================================================================
 
 	public void readFromParcel(DataInputStream src, WorldContext world, int fileversion) throws IOException {
@@ -96,7 +96,7 @@ public final class MonsterSpawnArea {
 			monsters.add(Monster.readFromParcel(src, world, fileversion));
 		}
 	}
-	
+
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
 		dest.writeInt(monsters.size());
 		for (Monster m : monsters) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
index 4f1020bbd..27e342601 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/PredefinedMap.java
@@ -20,7 +20,7 @@ import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class PredefinedMap {
 	private static final long VISIT_RESET = 0;
-	
+
 	public final int xmlResourceId;
 	public final String name;
 	public final Size size;
@@ -45,62 +45,62 @@ public final class PredefinedMap {
 		this.isOutdoors = isOutdoors;
 	}
 
-    public final boolean isOutside(final Coord p) { return isOutside(p.x, p.y); }
-    public final boolean isOutside(final int x, final int y) {
-    	if (x < 0) return true;
-    	if (y < 0) return true;
-    	if (x >= size.width) return true;
-    	if (y >= size.height) return true;
-    	return false;
-    }
-    public final boolean isOutside(final CoordRect area) {
-    	if (isOutside(area.topLeft)) return true;
-    	if (area.topLeft.x + area.size.width > size.width) return true;
-    	if (area.topLeft.y + area.size.height > size.height) return true;
-    	return false;
-    }
-    
-    public MapObject findEventObject(MapObject.MapObjectType objectType, String name) {
-    	for (MapObject o : eventObjects) {
-    		if (o.type == objectType && name.equals(o.id)) return o;
-    	}
-    	return null;
-    }
-    public MapObject getEventObjectAt(final Coord p) {
-    	for (MapObject o : eventObjects) {
-    		if (o.position.contains(p)) {
-    			return o;
-    		}
-    	}
-		return null;
-	}
-    public boolean hasContainerAt(final Coord p) {
-    	for (MapObject o : eventObjects) {
-    		if (o.type == MapObject.MapObjectType.container) {
-	    		if (o.position.contains(p)) {
-	    			return true;
-	    		}
-    		}
-    	}
+	public final boolean isOutside(final Coord p) { return isOutside(p.x, p.y); }
+	public final boolean isOutside(final int x, final int y) {
+		if (x < 0) return true;
+		if (y < 0) return true;
+		if (x >= size.width) return true;
+		if (y >= size.height) return true;
 		return false;
 	}
-    
-    public Monster getMonsterAt(final CoordRect p) {
-    	for (MonsterSpawnArea a : spawnAreas) {
-			Monster m = a.getMonsterAt(p);
-			if (m != null) return m;
-		}	
+	public final boolean isOutside(final CoordRect area) {
+		if (isOutside(area.topLeft)) return true;
+		if (area.topLeft.x + area.size.width > size.width) return true;
+		if (area.topLeft.y + area.size.height > size.height) return true;
+		return false;
+	}
+
+	public MapObject findEventObject(MapObject.MapObjectType objectType, String name) {
+		for (MapObject o : eventObjects) {
+			if (o.type == objectType && name.equals(o.id)) return o;
+		}
 		return null;
 	}
-    public Monster getMonsterAt(final Coord p) { return getMonsterAt(p.x, p.y); }
+	public MapObject getEventObjectAt(final Coord p) {
+		for (MapObject o : eventObjects) {
+			if (o.position.contains(p)) {
+				return o;
+			}
+		}
+		return null;
+	}
+	public boolean hasContainerAt(final Coord p) {
+		for (MapObject o : eventObjects) {
+			if (o.type == MapObject.MapObjectType.container) {
+				if (o.position.contains(p)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public Monster getMonsterAt(final CoordRect p) {
+		for (MonsterSpawnArea a : spawnAreas) {
+			Monster m = a.getMonsterAt(p);
+			if (m != null) return m;
+		}
+		return null;
+	}
+	public Monster getMonsterAt(final Coord p) { return getMonsterAt(p.x, p.y); }
 	public Monster getMonsterAt(final int x, final int y) {
 		for (MonsterSpawnArea a : spawnAreas) {
 			Monster m = a.getMonsterAt(x, y);
 			if (m != null) return m;
-		}	
+		}
 		return null;
 	}
-	
+
 	public Loot getBagAt(final Coord p) {
 		for (Loot l : groundBags) {
 			if (l.position.equals(p)) return l;
@@ -169,15 +169,15 @@ public final class PredefinedMap {
 
 	public void createAllContainerLoot() {
 		for (MapObject o : eventObjects) {
-    		if (o.type == MapObject.MapObjectType.container) {
-	    		Loot bag = getBagOrCreateAt(o.position.topLeft);
-	    		o.dropList.createRandomLoot(bag, null);
-    		}
-    	}
+			if (o.type == MapObject.MapObjectType.container) {
+				Loot bag = getBagOrCreateAt(o.position.topLeft);
+				o.dropList.createRandomLoot(bag, null);
+			}
+		}
 	}
 
-	
-	
+
+
 	// ====== PARCELABLE ===================================================================
 
 	public void readFromParcel(DataInputStream src, WorldContext world, ControllerContext controllers, int fileversion) throws IOException {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java
index ae545414b..3f5dc8c46 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/TMXMapFileParser.java
@@ -19,11 +19,11 @@ public final class TMXMapFileParser {
 	public static TMXObjectMap readObjectMap(Resources r, int xmlResourceId, String name) {
 		return readObjectMap(r.getXml(xmlResourceId), xmlResourceId, name);
 	}
-	
+
 	public static TMXLayerMap readLayerMap(Resources r, int xmlResourceId, String name) {
 		return readLayerMap(r.getXml(xmlResourceId), name);
 	}
-	
+
 	private static TMXObjectMap readObjectMap(XmlResourceParser xrp, int xmlResourceId, String name) {
 		final TMXObjectMap map = new TMXObjectMap();
 		map.xmlResourceId = xmlResourceId;
@@ -48,10 +48,10 @@ public final class TMXMapFileParser {
 								}
 							}
 						});
-					} 
+					}
 				}
-            }
-            xrp.close();
+			}
+			xrp.close();
 		} catch (XmlPullParserException e) {
 			L.log("Error reading map \"" + name + "\": XmlPullParserException : " + e.toString());
 		} catch (IOException e) {
@@ -59,7 +59,7 @@ public final class TMXMapFileParser {
 		}
 		return map;
 	}
-	
+
 
 	private static TMXLayerMap readLayerMap(XmlResourceParser xrp, final String name) {
 		final TMXLayerMap map = new TMXLayerMap();
@@ -89,12 +89,12 @@ public final class TMXMapFileParser {
 								}
 							}
 						});
-					} 
+					}
 				}
-            }
-            xrp.close();
-            map.layers = layers.toArray(new TMXLayer[layers.size()]);
-            map.tileSets = tileSets.toArray(new TMXTileSet[tileSets.size()]);
+			}
+			xrp.close();
+			map.layers = layers.toArray(new TMXLayer[layers.size()]);
+			map.tileSets = tileSets.toArray(new TMXTileSet[tileSets.size()]);
 		} catch (XmlPullParserException e) {
 			L.log("Error reading layered map \"" + name + "\": XmlPullParserException : " + e.toString());
 		} catch (IOException e) {
@@ -115,7 +115,7 @@ public final class TMXMapFileParser {
 				if (tagName.equals("image")) {
 					ts.imageSource = xrp.getAttributeValue(null, "source");
 					ts.imageName = ts.imageSource;
-					
+
 					int v = ts.imageName.lastIndexOf('/');
 					if (v >= 0) ts.imageName = ts.imageName.substring(v+1);
 				}
@@ -123,7 +123,7 @@ public final class TMXMapFileParser {
 		});
 		return ts;
 	}
-	
+
 	private static TMXObjectGroup readTMXObjectGroup(XmlResourceParser xrp) throws XmlPullParserException, IOException {
 		final TMXObjectGroup group = new TMXObjectGroup();
 		group.name = xrp.getAttributeValue(null, "name");
@@ -138,7 +138,7 @@ public final class TMXMapFileParser {
 		});
 		return group;
 	}
-	
+
 	private static TMXObject readTMXObject(XmlResourceParser xrp) throws XmlPullParserException, IOException {
 		final TMXObject object = new TMXObject();
 		object.name = xrp.getAttributeValue(null, "name");
@@ -156,7 +156,7 @@ public final class TMXMapFileParser {
 		});
 		return object;
 	}
-	
+
 	private static TMXLayer readTMXMapLayer(XmlResourceParser xrp) throws XmlPullParserException, IOException {
 		final TMXLayer layer = new TMXLayer();
 		layer.name = xrp.getAttributeValue(null, "name");
@@ -172,16 +172,16 @@ public final class TMXMapFileParser {
 		});
 		return layer;
 	}
-	
+
 	private static void readTMXMapLayerData(XmlResourceParser xrp, final TMXLayer layer) throws XmlPullParserException, IOException {
 		String compressionMethod = xrp.getAttributeValue(null, "compression");
 		xrp.next();
 		String data = xrp.getText().replaceAll("\\s", "");
 		final int len = layer.width * layer.height * 4;
-		
+
 		ByteArrayInputStream bi = new ByteArrayInputStream(Base64.decode(data));
 		if (compressionMethod == null) compressionMethod = "none";
-		
+
 		InflaterInputStream zi;
 		if (compressionMethod.equalsIgnoreCase("zlib")) {
 			zi = new InflaterInputStream(bi);
@@ -190,10 +190,10 @@ public final class TMXMapFileParser {
 		} else {
 			throw new IOException("Unhandled compression method \"" + compressionMethod + "\" for map layer " + layer.name);
 		}
-		
+
 		byte[] buffer = new byte[len];
 		copyStreamToBuffer(zi, buffer, len);
-		
+
 		zi.close();
 		bi.close();
 		int i = 0;
@@ -212,14 +212,14 @@ public final class TMXMapFileParser {
 			throw new IOException("Failed to create layout hash for map layer " + layer.name);
 		}
 	}
-	
+
 	private static TMXProperty readTMXProperty(XmlResourceParser xrp) {
 		final TMXProperty property = new TMXProperty();
 		property.name = xrp.getAttributeValue(null, "name");
 		property.value = xrp.getAttributeValue(null, "value");
 		return property;
 	}
-	
+
 	private static void copyStreamToBuffer(InflaterInputStream zi, byte[] buffer, int len) throws IOException {
 		int offset = 0;
 		int bytesToRead = len;
@@ -230,7 +230,7 @@ public final class TMXMapFileParser {
 			offset += b;
 		}
 	}
-	
+
 	/*
 	private static String getHexString(byte v) {
 		String result = Integer.toHexString(v & 0xff);
@@ -238,9 +238,9 @@ public final class TMXMapFileParser {
 		return result;
 	}
 	private static String getHexString(byte[] buffer, int offset) {
-		return getHexString(buffer[offset]) 
-			+ getHexString(buffer[offset+1]) 
-			+ getHexString(buffer[offset+2]) 
+		return getHexString(buffer[offset])
+			+ getHexString(buffer[offset+1])
+			+ getHexString(buffer[offset+2])
 			+ getHexString(buffer[offset+3]);
 	}
 	*/
@@ -250,7 +250,7 @@ public final class TMXMapFileParser {
 				(buffer[offset + 2] << 16) & 0x00ff0000 |
 				(buffer[offset + 3] << 24) & 0xff000000;
 	}
-	
+
 	public static final class TMXObjectMap extends TMXMap {
 		public int xmlResourceId;
 		public final ArrayList<TMXObjectGroup> objectGroups = new ArrayList<TMXObjectGroup>();
@@ -303,7 +303,7 @@ public final class TMXMapFileParser {
 		public String value;
 	}
 	/*
-	 
+
 	 <map version="1.0" orientation="orthogonal" width="10" height="10" tilewidth="32" tileheight="32">
 		 <tileset firstgid="1" name="tiles" tilewidth="32" tileheight="32">
 	  		<image source="tilesets/tiles.png"/>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
index 8b1a084d6..7be483428 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/map/WorldMapSegment.java
@@ -9,13 +9,13 @@ public final class WorldMapSegment {
 	public final String name;
 	public final HashMap<String, WorldMapSegmentMap> maps = new HashMap<String, WorldMapSegmentMap>();
 	public final HashMap<String, NamedWorldMapArea> namedAreas = new HashMap<String, NamedWorldMapArea>();
-	
+
 	public WorldMapSegment(String name) {
 		this.name = name;
 	}
-	
+
 	public boolean containsMap(String mapName) { return maps.containsKey(mapName); }
-	
+
 	public static final class WorldMapSegmentMap {
 		public final String mapName;
 		public final Coord worldPosition;
@@ -24,7 +24,7 @@ public final class WorldMapSegment {
 			this.worldPosition = worldPosition;
 		}
 	}
-	
+
 	// Towns, cities, villages, taverns, named dungeons
 	public static final class NamedWorldMapArea {
 		public final String id;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
index 64a3dc9a8..0dd3df5e9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/Quest.java
@@ -1,46 +1,46 @@
-package com.gpl.rpg.AndorsTrail.model.quest;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.model.actor.Player;
-import com.gpl.rpg.AndorsTrail.util.L;
-
-public final class Quest implements Comparable<Quest> {
-	public final String questID;
-	public final String name;
-	public final QuestLogEntry[] stages; //Must be sorted in ascending stage order
-	public final boolean showInLog;
-	public final int sortOrder;
-	
-	public Quest(String questID, String name, QuestLogEntry[] stages, boolean showInLog, int sortOrder) {
-		this.questID = questID;
-		this.name = name;
-		this.stages = stages;
-		this.showInLog = showInLog;
-		this.sortOrder = sortOrder;
-	}
-
-	public QuestLogEntry getQuestLogEntry(final int progress) {
-		for (QuestLogEntry s : stages) {
-			if (s.progress == progress) return s;
-		}
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-			L.log("WARNING: Cannot find stage " + progress + " in quest \"" + questID + "\".");
-		}
-		return null;
-	}
-
-	public boolean isCompleted(final Player player) {
-		for (QuestLogEntry e : stages) {
-			if (!e.finishesQuest) continue;
-			if (player.hasExactQuestProgress(questID, e.progress)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public int compareTo(Quest q) {
-		return sortOrder - q.sortOrder;
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.quest;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class Quest implements Comparable<Quest> {
+	public final String questID;
+	public final String name;
+	public final QuestLogEntry[] stages; //Must be sorted in ascending stage order
+	public final boolean showInLog;
+	public final int sortOrder;
+
+	public Quest(String questID, String name, QuestLogEntry[] stages, boolean showInLog, int sortOrder) {
+		this.questID = questID;
+		this.name = name;
+		this.stages = stages;
+		this.showInLog = showInLog;
+		this.sortOrder = sortOrder;
+	}
+
+	public QuestLogEntry getQuestLogEntry(final int progress) {
+		for (QuestLogEntry s : stages) {
+			if (s.progress == progress) return s;
+		}
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			L.log("WARNING: Cannot find stage " + progress + " in quest \"" + questID + "\".");
+		}
+		return null;
+	}
+
+	public boolean isCompleted(final Player player) {
+		for (QuestLogEntry e : stages) {
+			if (!e.finishesQuest) continue;
+			if (player.hasExactQuestProgress(questID, e.progress)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public int compareTo(Quest q) {
+		return sortOrder - q.sortOrder;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
index aafb2639a..9240eaa49 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestCollection.java
@@ -1,39 +1,39 @@
-package com.gpl.rpg.AndorsTrail.model.quest;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.resource.parsers.QuestParser;
-import com.gpl.rpg.AndorsTrail.util.L;
-
-public final class QuestCollection  {
-	private final HashMap<String, Quest> quests = new HashMap<String, Quest>();
-	
-	public Collection<Quest> getAllQuests() {
-		ArrayList<Quest> quests = new ArrayList<Quest>(this.quests.values());
-		Collections.sort(quests);
-		return quests;
-	}
-
-	public QuestLogEntry getQuestLogEntry(final QuestProgress stage) {
-		Quest q = getQuest(stage.questID);
-		if (q == null) return null;
-		return q.getQuestLogEntry(stage.progress);
-	}
-
-	public Quest getQuest(final String questID) {
-		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-			if (!quests.containsKey(questID)) {
-				L.log("WARNING: Cannot find quest \"" + questID + "\".");
-			}
-		}
-		return quests.get(questID);
-	}
-
-	public void initialize(QuestParser parser, String input) {
-		parser.parseRows(input, quests);
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.quest;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.QuestParser;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class QuestCollection {
+	private final HashMap<String, Quest> quests = new HashMap<String, Quest>();
+
+	public Collection<Quest> getAllQuests() {
+		ArrayList<Quest> quests = new ArrayList<Quest>(this.quests.values());
+		Collections.sort(quests);
+		return quests;
+	}
+
+	public QuestLogEntry getQuestLogEntry(final QuestProgress stage) {
+		Quest q = getQuest(stage.questID);
+		if (q == null) return null;
+		return q.getQuestLogEntry(stage.progress);
+	}
+
+	public Quest getQuest(final String questID) {
+		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			if (!quests.containsKey(questID)) {
+				L.log("WARNING: Cannot find quest \"" + questID + "\".");
+			}
+		}
+		return quests.get(questID);
+	}
+
+	public void initialize(QuestParser parser, String input) {
+		parser.parseRows(input, quests);
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java
index 4b6d8b131..c41fbb17c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestLogEntry.java
@@ -1,15 +1,15 @@
-package com.gpl.rpg.AndorsTrail.model.quest;
-
-public final class QuestLogEntry {
-	public final int progress;
-	public final String logtext;
-	public final int rewardExperience;
-	public final boolean finishesQuest;
-	
-	public QuestLogEntry(int progress, String logtext, int rewardExperience, boolean finishesQuest) {
-		this.progress = progress;
-		this.logtext = logtext;
-		this.rewardExperience = rewardExperience;
-		this.finishesQuest = finishesQuest;
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.quest;
+
+public final class QuestLogEntry {
+	public final int progress;
+	public final String logtext;
+	public final int rewardExperience;
+	public final boolean finishesQuest;
+
+	public QuestLogEntry(int progress, String logtext, int rewardExperience, boolean finishesQuest) {
+		this.progress = progress;
+		this.logtext = logtext;
+		this.rewardExperience = rewardExperience;
+		this.finishesQuest = finishesQuest;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java
index 8f1a0737d..1eb583276 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/model/quest/QuestProgress.java
@@ -1,32 +1,32 @@
-package com.gpl.rpg.AndorsTrail.model.quest;
-
-import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail.resource.parsers.ResourceParserUtils;
-import com.gpl.rpg.AndorsTrail.util.L;
-
-public final class QuestProgress {
-	public final String questID;
-	public final int progress;
-	public QuestProgress(String questID, int progress) {
-		this.questID = questID;
-		this.progress = progress;
-	}
-	
-	public static QuestProgress parseQuestProgress(String v) {
-		if (v == null || v.length() <= 0) return null;
-		String[] parts = v.split(":");
-		int requiresQuestProgress = 0;
-		if (parts.length >= 2) {
-			requiresQuestProgress = ResourceParserUtils.parseInt(parts[1], 0);
-		} else if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-			L.log("WARNING: Quest progress \"" + v + "\" does not specify any progress stage.");
-		}
-		final String requiresQuestID = parts[0];
-		return new QuestProgress(requiresQuestID, requiresQuestProgress);
-	}
-	
-	@Override
-	public String toString() {
-		return questID + ":" + progress;
-	}
-}
+package com.gpl.rpg.AndorsTrail.model.quest;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.resource.parsers.ResourceParserUtils;
+import com.gpl.rpg.AndorsTrail.util.L;
+
+public final class QuestProgress {
+	public final String questID;
+	public final int progress;
+	public QuestProgress(String questID, int progress) {
+		this.questID = questID;
+		this.progress = progress;
+	}
+
+	public static QuestProgress parseQuestProgress(String v) {
+		if (v == null || v.length() <= 0) return null;
+		String[] parts = v.split(":");
+		int requiresQuestProgress = 0;
+		if (parts.length >= 2) {
+			requiresQuestProgress = ResourceParserUtils.parseInt(parts[1], 0);
+		} else if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+			L.log("WARNING: Quest progress \"" + v + "\" does not specify any progress stage.");
+		}
+		final String requiresQuestID = parts[0];
+		return new QuestProgress(requiresQuestID, requiresQuestProgress);
+	}
+
+	@Override
+	public String toString() {
+		return questID + ":" + progress;
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
index bb7570585..525632447 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/DynamicTileLoader.java
@@ -14,11 +14,11 @@ import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class DynamicTileLoader {
 	private final TileCache tileCache;
-	
+
 	private final SparseArray<ResourceFileTilesetLoadList> preparedTilesetsByResourceId = new SparseArray<ResourceFileTilesetLoadList>();
 	private final HashMap<String, ResourceFileTilesetLoadList> preparedTilesetsByResourceName = new HashMap<String, ResourceFileTilesetLoadList>();
 	private int currentTileStoreIndex;
-	
+
 	private static final class ResourceFileTilesetLoadList {
 		public final ResourceFileTileset tileset;
 		public final SparseIntArray tileIDsToLoadPerLocalID = new SparseIntArray();
@@ -26,18 +26,18 @@ public final class DynamicTileLoader {
 			this.tileset = tileset;
 		}
 	}
-	
+
 	public DynamicTileLoader(TileCache tileCache) {
 		this.tileCache = tileCache;
 		initialize();
 	}
-	
+
 	private void initialize() {
 		preparedTilesetsByResourceId.clear();
 		preparedTilesetsByResourceName.clear();
 		currentTileStoreIndex = tileCache.getMaxTileID();
 	}
-	
+
 	public void prepareTileset(int resourceId, String tilesetName, Size numTiles, Size destinationTileSize) {
 		ResourceFileTileset b = new ResourceFileTileset(resourceId, tilesetName, numTiles, destinationTileSize);
 		ResourceFileTilesetLoadList loadList = new ResourceFileTilesetLoadList(b);
@@ -62,7 +62,7 @@ public final class DynamicTileLoader {
 		}
 		return preparedTilesetsByResourceName.get(tilesetName);
 	}
-	
+
 	public int prepareTileID(int tilesetImageResourceID, int localID) {
 		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetImageResourceID);
 		return prepareTileID(b, localID);
@@ -76,7 +76,7 @@ public final class DynamicTileLoader {
 		ResourceFileTilesetLoadList b = getTilesetBitmap(tilesetName);
 		return b.tileset.destinationTileSize;
 	}
-	
+
 	private int prepareTileID(ResourceFileTilesetLoadList tileset, int localID) {
 		int tileID = tileset.tileIDsToLoadPerLocalID.get(localID);
 		if (tileID == 0) {
@@ -97,9 +97,9 @@ public final class DynamicTileLoader {
 			}
 		}
 	}
-	
+
 	public void flush() {
-		tileCache.allocateMaxTileID(currentTileStoreIndex);	
+		tileCache.allocateMaxTileID(currentTileStoreIndex);
 		for (int i = 0; i < preparedTilesetsByResourceId.size(); ++i) {
 			ResourceFileTilesetLoadList e = preparedTilesetsByResourceId.valueAt(i);
 			ResourceFileTileset tileset = e.tileset;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
index 37a7476a8..5433a41a5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/ResourceLoader.java
@@ -27,176 +27,176 @@ public final class ResourceLoader {
 	private static final int conversationsListsResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_conversationlists_debug : R.array.loadresource_conversationlists;
 	private static final int monstersResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_monsters_debug : R.array.loadresource_monsters;
 	private static final int mapsResourceId = AndorsTrailApplication.DEVELOPMENT_DEBUGRESOURCES ? R.array.loadresource_maps_debug : R.array.loadresource_maps;
-    
+
 	private static long taskStart;
 	private static void timingCheckpoint(String loaderName) {
 		long now = System.currentTimeMillis();
 		long duration = now - taskStart;
-    	L.log(loaderName + " ran for " + duration + " ms.");
-    	taskStart = now;
-    }
-    
+		L.log(loaderName + " ran for " + duration + " ms.");
+		taskStart = now;
+	}
+
 	public static void loadResources(WorldContext world, Resources r) {
-    	long start = System.currentTimeMillis();
-    	taskStart = start;
-    	
-        final int mTileSize = world.tileManager.tileSize;
+		long start = System.currentTimeMillis();
+		taskStart = start;
 
-        TranslationLoader translationLoader = new TranslationLoader(r.getAssets(), r);
+		final int mTileSize = world.tileManager.tileSize;
 
-        DynamicTileLoader loader = new DynamicTileLoader(world.tileManager.tileCache);
-        prepareTilesets(loader, mTileSize);
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("prepareTilesets");
-        
-        // ========================================================================
-        // Load various ui icons
-        /*TileManager.iconID_CHAR_HERO = */loader.prepareTileID(R.drawable.char_hero, 0);
-        /*TileManager.iconID_selection_red = */loader.prepareTileID(R.drawable.ui_selections, 0);
-        /*TileManager.iconID_selection_yellow = */loader.prepareTileID(R.drawable.ui_selections, 1);
-        /*TileManager.iconID_groundbag = */loader.prepareTileID(R.drawable.ui_icon_equipment, 0);
-    	/*TileManager.iconID_boxopened = */loader.prepareTileID(R.drawable.ui_quickslots, 1);
-        /*TileManager.iconID_boxclosed = */loader.prepareTileID(R.drawable.ui_quickslots, 0);
-        /*TileManager.iconID_selection_blue = */loader.prepareTileID(R.drawable.ui_selections, 2);
-        /*TileManager.iconID_selection_purple = */loader.prepareTileID(R.drawable.ui_selections, 3);
-        /*TileManager.iconID_selection_green = */loader.prepareTileID(R.drawable.ui_selections, 4);
-        for(int i = 0; i < 5; ++i) {
-        	loader.prepareTileID(R.drawable.ui_splatters1, i);
-            loader.prepareTileID(R.drawable.ui_splatters1, i+8);
-        }
-        
-        
-        // ========================================================================
-        // Load effects
-        world.visualEffectTypes.initialize(loader);
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("VisualEffectLoader");
-        
-        // ========================================================================
-        // Load skills
-        world.skills.initialize();
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("SkillLoader");
-        
-        // ========================================================================
-        // Load item categories
-        final ItemCategoryParser itemCategoryParser = new ItemCategoryParser(translationLoader);
-        final TypedArray categoriesToLoad = r.obtainTypedArray(itemCategoriesResourceId);
-        for (int i = 0; i < categoriesToLoad.length(); ++i) {
-        	world.itemCategories.initialize(itemCategoryParser, readStringFromRaw(r, categoriesToLoad, i));
-        }
+		TranslationLoader translationLoader = new TranslationLoader(r.getAssets(), r);
+
+		DynamicTileLoader loader = new DynamicTileLoader(world.tileManager.tileCache);
+		prepareTilesets(loader, mTileSize);
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("prepareTilesets");
+
+		// ========================================================================
+		// Load various ui icons
+		/*TileManager.iconID_CHAR_HERO = */loader.prepareTileID(R.drawable.char_hero, 0);
+		/*TileManager.iconID_selection_red = */loader.prepareTileID(R.drawable.ui_selections, 0);
+		/*TileManager.iconID_selection_yellow = */loader.prepareTileID(R.drawable.ui_selections, 1);
+		/*TileManager.iconID_groundbag = */loader.prepareTileID(R.drawable.ui_icon_equipment, 0);
+		/*TileManager.iconID_boxopened = */loader.prepareTileID(R.drawable.ui_quickslots, 1);
+		/*TileManager.iconID_boxclosed = */loader.prepareTileID(R.drawable.ui_quickslots, 0);
+		/*TileManager.iconID_selection_blue = */loader.prepareTileID(R.drawable.ui_selections, 2);
+		/*TileManager.iconID_selection_purple = */loader.prepareTileID(R.drawable.ui_selections, 3);
+		/*TileManager.iconID_selection_green = */loader.prepareTileID(R.drawable.ui_selections, 4);
+		for(int i = 0; i < 5; ++i) {
+			loader.prepareTileID(R.drawable.ui_splatters1, i);
+			loader.prepareTileID(R.drawable.ui_splatters1, i+8);
+		}
+
+
+		// ========================================================================
+		// Load effects
+		world.visualEffectTypes.initialize(loader);
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("VisualEffectLoader");
+
+		// ========================================================================
+		// Load skills
+		world.skills.initialize();
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("SkillLoader");
+
+		// ========================================================================
+		// Load item categories
+		final ItemCategoryParser itemCategoryParser = new ItemCategoryParser(translationLoader);
+		final TypedArray categoriesToLoad = r.obtainTypedArray(itemCategoriesResourceId);
+		for (int i = 0; i < categoriesToLoad.length(); ++i) {
+			world.itemCategories.initialize(itemCategoryParser, readStringFromRaw(r, categoriesToLoad, i));
+		}
 		categoriesToLoad.recycle();
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ItemCategoryParser");
-        
-    	// ========================================================================
-        // Load condition types
-        final ActorConditionsTypeParser actorConditionsTypeParser = new ActorConditionsTypeParser(loader, translationLoader);
-        final TypedArray conditionsToLoad = r.obtainTypedArray(actorConditionsResourceId);
-        for (int i = 0; i < conditionsToLoad.length(); ++i) {
-        	world.actorConditionsTypes.initialize(actorConditionsTypeParser, readStringFromRaw(r, conditionsToLoad, i));
-        }
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ItemCategoryParser");
+
+		// ========================================================================
+		// Load condition types
+		final ActorConditionsTypeParser actorConditionsTypeParser = new ActorConditionsTypeParser(loader, translationLoader);
+		final TypedArray conditionsToLoad = r.obtainTypedArray(actorConditionsResourceId);
+		for (int i = 0; i < conditionsToLoad.length(); ++i) {
+			world.actorConditionsTypes.initialize(actorConditionsTypeParser, readStringFromRaw(r, conditionsToLoad, i));
+		}
 		conditionsToLoad.recycle();
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ActorConditionsTypeParser");
-        
-        // ========================================================================
-        // Load preloaded tiles
-        loader.flush();
-        world.tileManager.loadPreloadedTiles(r);
-        
-        
-        // ========================================================================
-        // Load items
-        final ItemTypeParser itemTypeParser = new ItemTypeParser(loader, world.actorConditionsTypes, world.itemCategories, translationLoader);
-        final TypedArray itemsToLoad = r.obtainTypedArray(itemsResourceId);
-        for (int i = 0; i < itemsToLoad.length(); ++i) {
-        	world.itemTypes.initialize(itemTypeParser, readStringFromRaw(r, itemsToLoad, i));
-        }
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ActorConditionsTypeParser");
+
+		// ========================================================================
+		// Load preloaded tiles
+		loader.flush();
+		world.tileManager.loadPreloadedTiles(r);
+
+
+		// ========================================================================
+		// Load items
+		final ItemTypeParser itemTypeParser = new ItemTypeParser(loader, world.actorConditionsTypes, world.itemCategories, translationLoader);
+		final TypedArray itemsToLoad = r.obtainTypedArray(itemsResourceId);
+		for (int i = 0; i < itemsToLoad.length(); ++i) {
+			world.itemTypes.initialize(itemTypeParser, readStringFromRaw(r, itemsToLoad, i));
+		}
 		itemsToLoad.recycle();
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ItemTypeParser");
-        
-        
-        // ========================================================================
-        // Load droplists
-        final DropListParser dropListParser = new DropListParser(world.itemTypes);
-        final TypedArray droplistsToLoad = r.obtainTypedArray(droplistsResourceId);
-        for (int i = 0; i < droplistsToLoad.length(); ++i) {
-        	world.dropLists.initialize(dropListParser, readStringFromRaw(r, droplistsToLoad, i));
-        }
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ItemTypeParser");
+
+
+		// ========================================================================
+		// Load droplists
+		final DropListParser dropListParser = new DropListParser(world.itemTypes);
+		final TypedArray droplistsToLoad = r.obtainTypedArray(droplistsResourceId);
+		for (int i = 0; i < droplistsToLoad.length(); ++i) {
+			world.dropLists.initialize(dropListParser, readStringFromRaw(r, droplistsToLoad, i));
+		}
 		droplistsToLoad.recycle();
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("DropListParser");
-        
-        
-        // ========================================================================
-        // Load quests
-        final QuestParser questParser = new QuestParser(translationLoader);
-        final TypedArray questsToLoad = r.obtainTypedArray(questsResourceId);
-        for (int i = 0; i < questsToLoad.length(); ++i) {
-        	world.quests.initialize(questParser, readStringFromRaw(r, questsToLoad, i));
-        }
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("DropListParser");
+
+
+		// ========================================================================
+		// Load quests
+		final QuestParser questParser = new QuestParser(translationLoader);
+		final TypedArray questsToLoad = r.obtainTypedArray(questsResourceId);
+		for (int i = 0; i < questsToLoad.length(); ++i) {
+			world.quests.initialize(questParser, readStringFromRaw(r, questsToLoad, i));
+		}
 		questsToLoad.recycle();
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("QuestParser");
-    	
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("QuestParser");
 
-        // ========================================================================
-        // Load conversations
-        final ConversationListParser conversationListParser = new ConversationListParser(translationLoader);
-        final TypedArray conversationsListsToLoad = r.obtainTypedArray(conversationsListsResourceId);
-        for (int i = 0; i < conversationsListsToLoad.length(); ++i) {
-        	ConversationCollection conversations = new ConversationCollection();
-        	Collection<String> ids = conversations.initialize(conversationListParser, readStringFromRaw(r, conversationsListsToLoad, i));
-        	world.conversationLoader.addIDs(conversationsListsToLoad.getResourceId(i, -1), ids);
-        }
+
+		// ========================================================================
+		// Load conversations
+		final ConversationListParser conversationListParser = new ConversationListParser(translationLoader);
+		final TypedArray conversationsListsToLoad = r.obtainTypedArray(conversationsListsResourceId);
+		for (int i = 0; i < conversationsListsToLoad.length(); ++i) {
+			ConversationCollection conversations = new ConversationCollection();
+			Collection<String> ids = conversations.initialize(conversationListParser, readStringFromRaw(r, conversationsListsToLoad, i));
+			world.conversationLoader.addIDs(conversationsListsToLoad.getResourceId(i, -1), ids);
+		}
 		conversationsListsToLoad.recycle();
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ConversationListParser");
-        
-        
-        // ========================================================================
-        // Load monsters
-        final MonsterTypeParser monsterTypeParser = new MonsterTypeParser(world.dropLists, world.actorConditionsTypes, loader, translationLoader);
-        final TypedArray monstersToLoad = r.obtainTypedArray(monstersResourceId);
-        for (int i = 0; i < monstersToLoad.length(); ++i) {
-        	world.monsterTypes.initialize(monsterTypeParser, readStringFromRaw(r, monstersToLoad, i));
-        }
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("ConversationListParser");
+
+
+		// ========================================================================
+		// Load monsters
+		final MonsterTypeParser monsterTypeParser = new MonsterTypeParser(world.dropLists, world.actorConditionsTypes, loader, translationLoader);
+		final TypedArray monstersToLoad = r.obtainTypedArray(monstersResourceId);
+		for (int i = 0; i < monstersToLoad.length(); ++i) {
+			world.monsterTypes.initialize(monsterTypeParser, readStringFromRaw(r, monstersToLoad, i));
+		}
 		monstersToLoad.recycle();
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("MonsterTypeParser");
-        
-        
-        // ========================================================================
-        // Load maps
-        TMXMapTranslator mapReader = new TMXMapTranslator();
-        final TypedArray mapsToLoad = r.obtainTypedArray(mapsResourceId);
-        for (int i = 0; i < mapsToLoad.length(); ++i) {
-        	final int mapResourceId = mapsToLoad.getResourceId(i, -1);
-        	final String mapName = r.getResourceEntryName(mapResourceId);
-        	mapReader.read(r, mapResourceId, mapName);
-        }
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("MonsterTypeParser");
+
+
+		// ========================================================================
+		// Load maps
+		TMXMapTranslator mapReader = new TMXMapTranslator();
+		final TypedArray mapsToLoad = r.obtainTypedArray(mapsResourceId);
+		for (int i = 0; i < mapsToLoad.length(); ++i) {
+			final int mapResourceId = mapsToLoad.getResourceId(i, -1);
+			final String mapName = r.getResourceEntryName(mapResourceId);
+			mapReader.read(r, mapResourceId, mapName);
+		}
 		mapsToLoad.recycle();
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("TMXMapReader");
-        world.maps.addAll(mapReader.transformMaps(world.monsterTypes, world.dropLists));
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("TMXMapReader");
+		world.maps.addAll(mapReader.transformMaps(world.monsterTypes, world.dropLists));
 		loader.prepareAllMapTiles();
-        mapReader = null;
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("mapReader.transformMaps");
-        
-        
-        // ========================================================================
-        // Load graphics resources (icons and tiles)
-        loader.flush();
-        loader = null;
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("DynamicTileLoader");
-        // ========================================================================
-        
-        
-        // ========================================================================
-        // Load worldmap coordinates
-        WorldMapParser.read(r, R.xml.worldmap, world.maps);
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("WorldMapParser");
-        // ========================================================================
+		mapReader = null;
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("mapReader.transformMaps");
 
-        translationLoader.close();
-        
 
-        if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
-        	long duration = System.currentTimeMillis() - start;
-        	L.log("ResourceLoader ran for " + duration + " ms.");
-        }
-    }
+		// ========================================================================
+		// Load graphics resources (icons and tiles)
+		loader.flush();
+		loader = null;
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("DynamicTileLoader");
+		// ========================================================================
+
+
+		// ========================================================================
+		// Load worldmap coordinates
+		WorldMapParser.read(r, R.xml.worldmap, world.maps);
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) timingCheckpoint("WorldMapParser");
+		// ========================================================================
+
+		translationLoader.close();
+
+
+		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
+			long duration = System.currentTimeMillis() - start;
+			L.log("ResourceLoader ran for " + duration + " ms.");
+		}
+	}
 
 	public static String readStringFromRaw(final Resources r, final TypedArray array, final int index) {
 		return readStringFromRaw(r, array.getResourceId(index, -1));
@@ -219,140 +219,140 @@ public final class ResourceLoader {
 
 	private static void prepareTilesets(DynamicTileLoader loader, int mTileSize) {
 		final Size dst_sz1x1 = new Size(mTileSize, mTileSize);
-        final Size dst_sz2x2 = new Size(mTileSize*2, mTileSize*2);
-        final Size dst_sz2x3 = new Size(mTileSize*2, mTileSize*3);
-        final Size defaultTileSize = dst_sz1x1;
-        final Size src_sz1x1 = new Size(1, 1);
-        final Size src_sz2x1 = new Size(2, 1);
-        final Size src_sz3x1 = new Size(3, 1);
-        final Size src_sz6x1 = new Size(6, 1);
-        final Size src_sz7x1 = new Size(7, 1);
-        final Size src_sz20x12 = new Size(20, 12);
-        final Size src_mapTileSize = new Size(16, 8);
-        final Size src_mapTileSize7 = new Size(16, 7);
+		final Size dst_sz2x2 = new Size(mTileSize*2, mTileSize*2);
+		final Size dst_sz2x3 = new Size(mTileSize*2, mTileSize*3);
+		final Size defaultTileSize = dst_sz1x1;
+		final Size src_sz1x1 = new Size(1, 1);
+		final Size src_sz2x1 = new Size(2, 1);
+		final Size src_sz3x1 = new Size(3, 1);
+		final Size src_sz6x1 = new Size(6, 1);
+		final Size src_sz7x1 = new Size(7, 1);
+		final Size src_sz20x12 = new Size(20, 12);
+		final Size src_mapTileSize = new Size(16, 8);
+		final Size src_mapTileSize7 = new Size(16, 7);
 
-        loader.prepareTileset(R.drawable.char_hero, "char_hero", src_sz1x1, defaultTileSize);
-        
-        loader.prepareTileset(R.drawable.ui_selections, "ui_selections", new Size(5, 1), defaultTileSize);
-        loader.prepareTileset(R.drawable.ui_quickslots, "ui_quickslots", src_sz2x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.ui_icon_equipment, "ui_icon_equipment", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.ui_splatters1, "ui_splatters1", new Size(8, 2), defaultTileSize);
-        
-        loader.prepareTileset(R.drawable.actorconditions_1, "actorconditions_1", new Size(14, 8), defaultTileSize);
-        loader.prepareTileset(R.drawable.actorconditions_2, "actorconditions_2", src_sz3x1, defaultTileSize);
-        
-        loader.prepareTileset(R.drawable.items_armours, "items_armours", new Size(14, 3), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_weapons, "items_weapons", new Size(14, 6), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_jewelry, "items_jewelry", new Size(14, 1), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_consumables, "items_consumables", new Size(14, 5), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_books, "items_books", new Size(11, 1), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_misc, "items_misc", new Size(14, 4), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_misc_2, "items_misc_2", src_sz20x12, defaultTileSize);
-        loader.prepareTileset(R.drawable.items_misc_3, "items_misc_3", src_sz20x12, defaultTileSize);
-        loader.prepareTileset(R.drawable.items_misc_4, "items_misc_4", new Size(20, 4), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_misc_5, "items_misc_5", new Size(9, 5), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_misc_6, "items_misc_6", new Size(9, 4), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_reterski_1, "items_reterski_1", new Size(3, 10), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_tometik1, "items_tometik1", new Size(6, 10), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_tometik2, "items_tometik2", new Size(10, 10), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_tometik3, "items_tometik3", new Size(8, 6), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_necklaces_1, "items_necklaces_1", new Size(10, 3), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_weapons_2, "items_weapons_2", new Size(7, 1), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_weapons_3, "items_weapons_3", new Size(13, 5), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_armours_2, "items_armours_2", src_sz7x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.items_armours_3, "items_armours_3", new Size(10, 4), defaultTileSize);
-        loader.prepareTileset(R.drawable.items_rings_1, "items_rings_1", new Size(10, 3), defaultTileSize);
-        
-        loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_cyclops, "monsters_cyclops", src_sz1x1, dst_sz2x3);
-        loader.prepareTileset(R.drawable.monsters_demon1, "monsters_demon1", src_sz1x1, dst_sz2x2);
-        loader.prepareTileset(R.drawable.monsters_demon2, "monsters_demon2", src_sz1x1, dst_sz2x2);
-        loader.prepareTileset(R.drawable.monsters_dogs, "monsters_dogs", src_sz7x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_eye1, "monsters_eye1", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_eye2, "monsters_eye2", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_eye3, "monsters_eye3", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_eye4, "monsters_eye4", src_sz1x1, defaultTileSize);
-	    loader.prepareTileset(R.drawable.monsters_ghost1, "monsters_ghost1", src_sz1x1, defaultTileSize);
-	    loader.prepareTileset(R.drawable.monsters_hydra1, "monsters_hydra1", src_sz1x1, dst_sz2x2);
-        loader.prepareTileset(R.drawable.monsters_insects, "monsters_insects", src_sz6x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_karvis1, "monsters_karvis1", src_sz2x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_karvis2, "monsters_karvis2", new Size(9, 1), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", new Size(20, 12), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", new Size(20, 12), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_liches, "monsters_liches", new Size(4, 1), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_mage, "monsters_mage", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_mage2, "monsters_mage2", src_sz1x1, defaultTileSize);
-	    loader.prepareTileset(R.drawable.monsters_man1, "monsters_man1", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_men, "monsters_men", new Size(9, 1), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_men2, "monsters_men2", new Size(10, 1), defaultTileSize);
-	    loader.prepareTileset(R.drawable.monsters_misc, "monsters_misc", new Size(12, 1), defaultTileSize);
-    	loader.prepareTileset(R.drawable.monsters_rats, "monsters_rats", new Size(5, 1), defaultTileSize);
-    	loader.prepareTileset(R.drawable.monsters_redshrike1, "monsters_redshrike1", src_sz7x1, defaultTileSize);
-    	loader.prepareTileset(R.drawable.monsters_rltiles1, "monsters_rltiles1", new Size(20, 8), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_rltiles2, "monsters_rltiles2", new Size(20, 9), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_rltiles3, "monsters_rltiles3", new Size(10, 3), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_rltiles4, "monsters_rltiles4", new Size(12, 4), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_rogue1, "monsters_rogue1", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_skeleton1, "monsters_skeleton1", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_skeleton2, "monsters_skeleton2", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_snakes, "monsters_snakes", src_sz6x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik1, "monsters_tometik1", new Size(10, 9), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik2, "monsters_tometik2", new Size(8, 10), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik3, "monsters_tometik3", new Size(6, 13), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik4, "monsters_tometik4", new Size(6, 13), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik5, "monsters_tometik5", new Size(6, 16), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik6, "monsters_tometik6", new Size(7, 6), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik7, "monsters_tometik7", new Size(8, 11), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik8, "monsters_tometik8", new Size(7, 9), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik9, "monsters_tometik9", new Size(8, 8), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_tometik10, "monsters_tometik10", new Size(6, 13), defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_wraiths, "monsters_wraiths", src_sz3x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_zombie1, "monsters_zombie1", src_sz1x1, defaultTileSize);
-        loader.prepareTileset(R.drawable.monsters_zombie2, "monsters_zombie2", src_sz1x1, defaultTileSize);
-        
-        loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_border_1, "map_border_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_bridge_1, "map_bridge_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_broken_1, "map_broken_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_cavewall_1, "map_cavewall_1.png", new Size(18, 6), defaultTileSize);
-        loader.prepareTileset(R.drawable.map_cavewall_2, "map_cavewall_2.png", new Size(18, 6), defaultTileSize);
-        loader.prepareTileset(R.drawable.map_cavewall_3, "map_cavewall_3.png", new Size(18, 6), defaultTileSize);
-        loader.prepareTileset(R.drawable.map_chair_table_1, "map_chair_table_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_crate_1, "map_crate_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_cupboard_1, "map_cupboard_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_curtain_1, "map_curtain_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_entrance_1, "map_entrance_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_fence_1, "map_fence_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_fence_2, "map_fence_2.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_ground_1, "map_ground_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_ground_2, "map_ground_2.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_ground_3, "map_ground_3.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_ground_4, "map_ground_4.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_ground_5, "map_ground_5.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_ground_6, "map_ground_6.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_ground_7, "map_ground_7.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_ground_8, "map_ground_8.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_indoor_1, "map_indoor_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_kitchen_1, "map_kitchen_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_outdoor_1, "map_outdoor_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_pillar_1, "map_pillar_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_plant_1, "map_plant_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_rock_1, "map_rock_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_roof_1, "map_roof_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_roof_2, "map_roof_2.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_shop_1, "map_shop_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_sign_ladder_1, "map_sign_ladder_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_table_1, "map_table_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_trail_1, "map_trail_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_tree_1, "map_tree_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_wall_1, "map_wall_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_wall_2, "map_wall_2.png", new Size(15, 8), defaultTileSize);
-        loader.prepareTileset(R.drawable.map_wall_3, "map_wall_3.png", new Size(15, 8), defaultTileSize);
-        loader.prepareTileset(R.drawable.map_window_1, "map_window_1.png", src_mapTileSize, defaultTileSize);
-        loader.prepareTileset(R.drawable.map_window_2, "map_window_2.png", src_mapTileSize, defaultTileSize);
-        
-        loader.prepareTileset(R.drawable.effect_blood4, "effect_blood4", new Size(7, 2), defaultTileSize);
-        loader.prepareTileset(R.drawable.effect_heal2, "effect_heal2", new Size(8, 2), defaultTileSize);
-        loader.prepareTileset(R.drawable.effect_poison1, "effect_poison1", new Size(8, 2), defaultTileSize);
+		loader.prepareTileset(R.drawable.char_hero, "char_hero", src_sz1x1, defaultTileSize);
+
+		loader.prepareTileset(R.drawable.ui_selections, "ui_selections", new Size(5, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.ui_quickslots, "ui_quickslots", src_sz2x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.ui_icon_equipment, "ui_icon_equipment", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.ui_splatters1, "ui_splatters1", new Size(8, 2), defaultTileSize);
+
+		loader.prepareTileset(R.drawable.actorconditions_1, "actorconditions_1", new Size(14, 8), defaultTileSize);
+		loader.prepareTileset(R.drawable.actorconditions_2, "actorconditions_2", src_sz3x1, defaultTileSize);
+
+		loader.prepareTileset(R.drawable.items_armours, "items_armours", new Size(14, 3), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_weapons, "items_weapons", new Size(14, 6), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_jewelry, "items_jewelry", new Size(14, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_consumables, "items_consumables", new Size(14, 5), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_books, "items_books", new Size(11, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_misc, "items_misc", new Size(14, 4), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_misc_2, "items_misc_2", src_sz20x12, defaultTileSize);
+		loader.prepareTileset(R.drawable.items_misc_3, "items_misc_3", src_sz20x12, defaultTileSize);
+		loader.prepareTileset(R.drawable.items_misc_4, "items_misc_4", new Size(20, 4), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_misc_5, "items_misc_5", new Size(9, 5), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_misc_6, "items_misc_6", new Size(9, 4), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_reterski_1, "items_reterski_1", new Size(3, 10), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_tometik1, "items_tometik1", new Size(6, 10), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_tometik2, "items_tometik2", new Size(10, 10), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_tometik3, "items_tometik3", new Size(8, 6), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_necklaces_1, "items_necklaces_1", new Size(10, 3), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_weapons_2, "items_weapons_2", new Size(7, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_weapons_3, "items_weapons_3", new Size(13, 5), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_armours_2, "items_armours_2", src_sz7x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.items_armours_3, "items_armours_3", new Size(10, 4), defaultTileSize);
+		loader.prepareTileset(R.drawable.items_rings_1, "items_rings_1", new Size(10, 3), defaultTileSize);
+
+		loader.prepareTileset(R.drawable.monsters_armor1, "monsters_armor1", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_cyclops, "monsters_cyclops", src_sz1x1, dst_sz2x3);
+		loader.prepareTileset(R.drawable.monsters_demon1, "monsters_demon1", src_sz1x1, dst_sz2x2);
+		loader.prepareTileset(R.drawable.monsters_demon2, "monsters_demon2", src_sz1x1, dst_sz2x2);
+		loader.prepareTileset(R.drawable.monsters_dogs, "monsters_dogs", src_sz7x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_eye1, "monsters_eye1", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_eye2, "monsters_eye2", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_eye3, "monsters_eye3", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_eye4, "monsters_eye4", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_ghost1, "monsters_ghost1", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_hydra1, "monsters_hydra1", src_sz1x1, dst_sz2x2);
+		loader.prepareTileset(R.drawable.monsters_insects, "monsters_insects", src_sz6x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_karvis1, "monsters_karvis1", src_sz2x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_karvis2, "monsters_karvis2", new Size(9, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_ld1, "monsters_ld1", new Size(20, 12), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_ld2, "monsters_ld2", new Size(20, 12), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_liches, "monsters_liches", new Size(4, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_mage, "monsters_mage", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_mage2, "monsters_mage2", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_man1, "monsters_man1", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_men, "monsters_men", new Size(9, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_men2, "monsters_men2", new Size(10, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_misc, "monsters_misc", new Size(12, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_rats, "monsters_rats", new Size(5, 1), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_redshrike1, "monsters_redshrike1", src_sz7x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_rltiles1, "monsters_rltiles1", new Size(20, 8), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_rltiles2, "monsters_rltiles2", new Size(20, 9), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_rltiles3, "monsters_rltiles3", new Size(10, 3), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_rltiles4, "monsters_rltiles4", new Size(12, 4), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_rogue1, "monsters_rogue1", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_skeleton1, "monsters_skeleton1", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_skeleton2, "monsters_skeleton2", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_snakes, "monsters_snakes", src_sz6x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik1, "monsters_tometik1", new Size(10, 9), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik2, "monsters_tometik2", new Size(8, 10), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik3, "monsters_tometik3", new Size(6, 13), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik4, "monsters_tometik4", new Size(6, 13), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik5, "monsters_tometik5", new Size(6, 16), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik6, "monsters_tometik6", new Size(7, 6), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik7, "monsters_tometik7", new Size(8, 11), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik8, "monsters_tometik8", new Size(7, 9), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik9, "monsters_tometik9", new Size(8, 8), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_tometik10, "monsters_tometik10", new Size(6, 13), defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_wraiths, "monsters_wraiths", src_sz3x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_zombie1, "monsters_zombie1", src_sz1x1, defaultTileSize);
+		loader.prepareTileset(R.drawable.monsters_zombie2, "monsters_zombie2", src_sz1x1, defaultTileSize);
+
+		loader.prepareTileset(R.drawable.map_bed_1, "map_bed_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_border_1, "map_border_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_bridge_1, "map_bridge_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_broken_1, "map_broken_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_cavewall_1, "map_cavewall_1.png", new Size(18, 6), defaultTileSize);
+		loader.prepareTileset(R.drawable.map_cavewall_2, "map_cavewall_2.png", new Size(18, 6), defaultTileSize);
+		loader.prepareTileset(R.drawable.map_cavewall_3, "map_cavewall_3.png", new Size(18, 6), defaultTileSize);
+		loader.prepareTileset(R.drawable.map_chair_table_1, "map_chair_table_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_crate_1, "map_crate_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_cupboard_1, "map_cupboard_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_curtain_1, "map_curtain_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_entrance_1, "map_entrance_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_fence_1, "map_fence_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_fence_2, "map_fence_2.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_ground_1, "map_ground_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_ground_2, "map_ground_2.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_ground_3, "map_ground_3.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_ground_4, "map_ground_4.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_ground_5, "map_ground_5.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_ground_6, "map_ground_6.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_ground_7, "map_ground_7.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_ground_8, "map_ground_8.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_indoor_1, "map_indoor_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_kitchen_1, "map_kitchen_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_outdoor_1, "map_outdoor_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_pillar_1, "map_pillar_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_plant_1, "map_plant_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_rock_1, "map_rock_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_roof_1, "map_roof_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_roof_2, "map_roof_2.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_shop_1, "map_shop_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_sign_ladder_1, "map_sign_ladder_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_table_1, "map_table_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_trail_1, "map_trail_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_tree_1, "map_tree_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_wall_1, "map_wall_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_wall_2, "map_wall_2.png", new Size(15, 8), defaultTileSize);
+		loader.prepareTileset(R.drawable.map_wall_3, "map_wall_3.png", new Size(15, 8), defaultTileSize);
+		loader.prepareTileset(R.drawable.map_window_1, "map_window_1.png", src_mapTileSize, defaultTileSize);
+		loader.prepareTileset(R.drawable.map_window_2, "map_window_2.png", src_mapTileSize, defaultTileSize);
+
+		loader.prepareTileset(R.drawable.effect_blood4, "effect_blood4", new Size(7, 2), defaultTileSize);
+		loader.prepareTileset(R.drawable.effect_heal2, "effect_heal2", new Size(8, 2), defaultTileSize);
+		loader.prepareTileset(R.drawable.effect_poison1, "effect_poison1", new Size(8, 2), defaultTileSize);
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
index f74c6d84f..8d16bf059 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/TranslationLoader.java
@@ -11,164 +11,164 @@ import java.io.IOException;
 import java.io.InputStream;
 
 public final class TranslationLoader {
-    private final BinaryMoFileParser parser;
+	private final BinaryMoFileParser parser;
 
-    public TranslationLoader(AssetManager mgr, Resources res) {
-        this.parser = createParser(mgr, res);
-    }
-    public TranslationLoader(AssetManager mgr, String filename) {
-        this.parser = createParser(mgr, filename);
-    }
+	public TranslationLoader(AssetManager mgr, Resources res) {
+		this.parser = createParser(mgr, res);
+	}
+	public TranslationLoader(AssetManager mgr, String filename) {
+		this.parser = createParser(mgr, filename);
+	}
 
-    private static final String translationDir = "translation" + File.separator;
-    private static BinaryMoFileParser createParser(AssetManager mgr, Resources res) {
-        String translationFilename = res.getString(R.string.localize_resources_from_mo_filename);
-        if (translationFilename == null || translationFilename.length() <= 0) return null;
+	private static final String translationDir = "translation" + File.separator;
+	private static BinaryMoFileParser createParser(AssetManager mgr, Resources res) {
+		String translationFilename = res.getString(R.string.localize_resources_from_mo_filename);
+		if (translationFilename == null || translationFilename.length() <= 0) return null;
 
-        return createParser(mgr, translationDir + translationFilename);
-    }
+		return createParser(mgr, translationDir + translationFilename);
+	}
 
-    private static BinaryMoFileParser createParser(AssetManager mgr, String translationFilename) {
-        try {
+	private static BinaryMoFileParser createParser(AssetManager mgr, String translationFilename) {
+		try {
 			InputStream is = mgr.open(translationFilename, AssetManager.ACCESS_RANDOM);
 			return new BinaryMoFileParser(is);
-        } catch (IOException e) {
-            L.log("ERROR: Reading from translation asset \"" + translationFilename + "\" failed: " + e.toString());
-            return null;
-        }
-    }
+		} catch (IOException e) {
+			L.log("ERROR: Reading from translation asset \"" + translationFilename + "\" failed: " + e.toString());
+			return null;
+		}
+	}
 
-    private String tr(String s) {
-        if (s == null) return null;
-        if (parser == null) return s;
-        if (s.length() <= 1) return s;
-        try {
-            //String t = parser.translate(s);
-            //L.log(translations.size() + " : " + s + " -> " + t);
-            //return t;
-            return parser.translate(s);
-        } catch (IOException e) {
-            return s;
-        }
-    }
+	private String tr(String s) {
+		if (s == null) return null;
+		if (parser == null) return s;
+		if (s.length() <= 1) return s;
+		try {
+			//String t = parser.translate(s);
+			//L.log(translations.size() + " : " + s + " -> " + t);
+			//return t;
+			return parser.translate(s);
+		} catch (IOException e) {
+			return s;
+		}
+	}
 
-    public void close() {
-        if (parser == null) return;
-        try {
-            parser.close();
-        } catch (IOException e) { }
-    }
+	public void close() {
+		if (parser == null) return;
+		try {
+			parser.close();
+		} catch (IOException e) { }
+	}
 
-    public String translateItemCategoryName(String s) { return tr(s); }
-    public String translateActorConditionName(String s) { return tr(s); }
-    public String translateItemTypeName(String s) { return tr(s); }
-    public String translateItemTypeDescription(String s) {return tr(s); }
-    public String translateMonsterTypeName(String s) { return tr(s); }
-    public String translateQuestName(String s) { return tr(s); }
-    public String translateQuestLogEntry(String s) { return tr(s); }
-    public String translateConversationPhrase(String s) { return tr(s); }
-    public String translateConversationReply(String s) { return tr(s); }
+	public String translateItemCategoryName(String s) { return tr(s); }
+	public String translateActorConditionName(String s) { return tr(s); }
+	public String translateItemTypeName(String s) { return tr(s); }
+	public String translateItemTypeDescription(String s) {return tr(s); }
+	public String translateMonsterTypeName(String s) { return tr(s); }
+	public String translateQuestName(String s) { return tr(s); }
+	public String translateQuestLogEntry(String s) { return tr(s); }
+	public String translateConversationPhrase(String s) { return tr(s); }
+	public String translateConversationReply(String s) { return tr(s); }
 
-    private static final class BinaryMoFileParser {
-        private final InputStream is;
-        private final BufferedInputStream reader;
-        private final int numStrings;
-        private final int offsetOriginalStrings;
-        private final int offsetTranslatedStrings;
+	private static final class BinaryMoFileParser {
+		private final InputStream is;
+		private final BufferedInputStream reader;
+		private final int numStrings;
+		private final int offsetOriginalStrings;
+		private final int offsetTranslatedStrings;
 
-        public BinaryMoFileParser(InputStream is) throws IOException {
-            this.is = is;
-            this.reader = new BufferedInputStream(is, is.available());
-            this.reader.mark(9999999);
-            int magic = readIntLE();
-            if (magic != 0x950412de) throw new IOException("Invalid magic in MO file");
-            this.reader.skip(4);
-            numStrings = readIntLE();
-            offsetOriginalStrings = readIntLE();
-            offsetTranslatedStrings = readIntLE();
-        }
+		public BinaryMoFileParser(InputStream is) throws IOException {
+			this.is = is;
+			this.reader = new BufferedInputStream(is, is.available());
+			this.reader.mark(9999999);
+			int magic = readIntLE();
+			if (magic != 0x950412de) throw new IOException("Invalid magic in MO file");
+			this.reader.skip(4);
+			numStrings = readIntLE();
+			offsetOriginalStrings = readIntLE();
+			offsetTranslatedStrings = readIntLE();
+		}
 
-        public void close() throws IOException {
-            reader.close();
-            is.close();
-        }
+		public void close() throws IOException {
+			reader.close();
+			is.close();
+		}
 
-        private static final String charset = "utf-8";
+		private static final String charset = "utf-8";
 
-        public String translate(String s) throws IOException {
-            if (numStrings <= 0) return s;
+		public String translate(String s) throws IOException {
+			if (numStrings <= 0) return s;
 
-            byte[] bytes = s.getBytes(charset);
-            byte[] translation = find(bytes);
-            if (translation == null || translation.length <= 0) return s;
-            return new String(translation, charset);
-        }
+			byte[] bytes = s.getBytes(charset);
+			byte[] translation = find(bytes);
+			if (translation == null || translation.length <= 0) return s;
+			return new String(translation, charset);
+		}
 
-        private byte[] find(byte[] bytes) throws IOException {
-            return find(bytes, 0, numStrings);
-        }
+		private byte[] find(byte[] bytes) throws IOException {
+			return find(bytes, 0, numStrings);
+		}
 
-        private byte[] find(byte[] bytes, int minIndex, int maxIndex) throws IOException {
-            int middleIndex;
-            while(minIndex != maxIndex) {
-                if (minIndex+1 == maxIndex) middleIndex = minIndex;
-                else if (minIndex+2 == maxIndex) middleIndex = minIndex;
-                else middleIndex = (minIndex + maxIndex) / 2;
+		private byte[] find(byte[] bytes, int minIndex, int maxIndex) throws IOException {
+			int middleIndex;
+			while(minIndex != maxIndex) {
+				if (minIndex+1 == maxIndex) middleIndex = minIndex;
+				else if (minIndex+2 == maxIndex) middleIndex = minIndex;
+				else middleIndex = (minIndex + maxIndex) / 2;
 
-                int c = compare(bytes, middleIndex);
-                if (c == 0) return getTranslatedStringAt(middleIndex);
+				int c = compare(bytes, middleIndex);
+				if (c == 0) return getTranslatedStringAt(middleIndex);
 
-                if (minIndex+1 == maxIndex) {
-                    return null;
-                } else if (c > 0) {
-                    maxIndex = middleIndex;
-                } else {
-                    minIndex = middleIndex+1;
-                }
-            }
-            return null;
-        }
+				if (minIndex+1 == maxIndex) {
+					return null;
+				} else if (c > 0) {
+					maxIndex = middleIndex;
+				} else {
+					minIndex = middleIndex+1;
+				}
+			}
+			return null;
+		}
 
-        private final byte[] buf = new byte[8];
-        public final int readIntLE() throws IOException
-        {
-            reader.read(buf, 0, 4);
-            return
-                    (buf[3])      << 24 |
-                    (buf[2]&0xff) << 16 |
-                    (buf[1]&0xff) <<  8 |
-                    (buf[0]&0xff);
-        }
+		private final byte[] buf = new byte[8];
+		public final int readIntLE() throws IOException
+		{
+			reader.read(buf, 0, 4);
+			return
+					(buf[3]&0xff) << 24 |
+					(buf[2]&0xff) << 16 |
+					(buf[1]&0xff) <<  8 |
+					(buf[0]&0xff);
+		}
 
-        private void seek(int pos) throws IOException {
-            reader.reset();
-            reader.skip(pos);
-        }
+		private void seek(int pos) throws IOException {
+			reader.reset();
+			reader.skip(pos);
+		}
 
-        private byte[] getTranslatedStringAt(int idx) throws IOException {
-            seek(offsetTranslatedStrings + idx*8);
-            int length = readIntLE();
-            int offset = readIntLE();
-            seek(offset);
-            byte[] result = new byte[length];
-            reader.read(result, 0, length);
-            return result;
-        }
+		private byte[] getTranslatedStringAt(int idx) throws IOException {
+			seek(offsetTranslatedStrings + idx*8);
+			int length = readIntLE();
+			int offset = readIntLE();
+			seek(offset);
+			byte[] result = new byte[length];
+			reader.read(result, 0, length);
+			return result;
+		}
 
-        private int compare(byte[] bytes, int idx) throws IOException {
-            seek(offsetOriginalStrings + idx*8);
-            int length = readIntLE();
-            int offset = readIntLE();
-            seek(offset);
-            int maxLength = bytes.length;
-            for(int i = 0; i < length; ++i) {
-                if (i == maxLength) return 1;
-                int b = reader.read();
-                if (b == bytes[i]) continue;
-                return (b < bytes[i]) ? -1 : 1;
-            }
-            if (length < maxLength) return -1;
-            return 0;
-        }
-    }
+		private int compare(byte[] bytes, int idx) throws IOException {
+			seek(offsetOriginalStrings + idx*8);
+			int length = readIntLE();
+			int offset = readIntLE();
+			seek(offset);
+			int maxLength = bytes.length;
+			for(int i = 0; i < length; ++i) {
+				if (i == maxLength) return 1;
+				int b = reader.read();
+				if (b == bytes[i]) continue;
+				return (b < bytes[i]) ? -1 : 1;
+			}
+			if (length < maxLength) return -1;
+			return 0;
+		}
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
index c96c6b3cb..b5e385712 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ActorConditionsTypeParser.java
@@ -10,14 +10,14 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 public final class ActorConditionsTypeParser extends JsonCollectionParserFor<ActorConditionType> {
-	
-	private final DynamicTileLoader tileLoader;
-    private final TranslationLoader translationLoader;
 
-    public ActorConditionsTypeParser(final DynamicTileLoader tileLoader, TranslationLoader translationLoader) {
+	private final DynamicTileLoader tileLoader;
+	private final TranslationLoader translationLoader;
+
+	public ActorConditionsTypeParser(final DynamicTileLoader tileLoader, TranslationLoader translationLoader) {
 		this.tileLoader = tileLoader;
-        this.translationLoader = translationLoader;
-    }
+		this.translationLoader = translationLoader;
+	}
 
 	@Override
 	protected Pair<String, ActorConditionType> parseObject(JSONObject o) throws JSONException {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
index eca7c62d4..15e62cd20 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ConversationListParser.java
@@ -16,7 +16,7 @@ import org.json.JSONObject;
 
 public final class ConversationListParser extends JsonCollectionParserFor<Phrase> {
 
-    private final TranslationLoader translationLoader;
+	private final TranslationLoader translationLoader;
 
 	private final JsonArrayParserFor<Requirement> requirementParser = new JsonArrayParserFor<Requirement>(Requirement.class) {
 		@Override
@@ -29,17 +29,17 @@ public final class ConversationListParser extends JsonCollectionParserFor<Phrase
 		}
 	};
 
-    private final JsonArrayParserFor<Reply> replyParser = new JsonArrayParserFor<Reply>(Reply.class) {
+	private final JsonArrayParserFor<Reply> replyParser = new JsonArrayParserFor<Reply>(Reply.class) {
 		@Override
 		protected Reply parseObject(JSONObject o) throws JSONException {
 			return new Reply(
-                    translationLoader.translateConversationReply(o.optString(JsonFieldNames.Reply.text, ""))
+					translationLoader.translateConversationReply(o.optString(JsonFieldNames.Reply.text, ""))
 					,o.getString(JsonFieldNames.Reply.nextPhraseID)
 					,requirementParser.parseArray(o.optJSONArray(JsonFieldNames.Reply.requires))
 			);
 		}
 	};
-	
+
 	private final JsonArrayParserFor<Reward> rewardParser = new JsonArrayParserFor<Reward>(Reward.class) {
 		@Override
 		protected Reward parseObject(JSONObject o) throws JSONException {
@@ -51,11 +51,11 @@ public final class ConversationListParser extends JsonCollectionParserFor<Phrase
 		}
 	};
 
-    public ConversationListParser(TranslationLoader translationLoader) {
-        this.translationLoader = translationLoader;
-    }
+	public ConversationListParser(TranslationLoader translationLoader) {
+		this.translationLoader = translationLoader;
+	}
 
-    @Override
+	@Override
 	protected Pair<String, Phrase> parseObject(JSONObject o) throws JSONException {
 		final String id = o.getString(JsonFieldNames.Phrase.phraseID);
 
@@ -71,7 +71,7 @@ public final class ConversationListParser extends JsonCollectionParserFor<Phrase
 		}
 
 		return new Pair<String, Phrase>(id, new Phrase(
-                translationLoader.translateConversationPhrase(o.optString(JsonFieldNames.Phrase.message, null))
+				translationLoader.translateConversationPhrase(o.optString(JsonFieldNames.Phrase.message, null))
 				, _replies
 				, _rewards
 		));
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java
index e2768b900..0bdc4b3b4 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemCategoryParser.java
@@ -11,14 +11,14 @@ import org.json.JSONObject;
 
 public final class ItemCategoryParser extends JsonCollectionParserFor<ItemCategory> {
 
-    private final TranslationLoader translationLoader;
+	private final TranslationLoader translationLoader;
 
-    public ItemCategoryParser(TranslationLoader translationLoader) {
+	public ItemCategoryParser(TranslationLoader translationLoader) {
 
-        this.translationLoader = translationLoader;
-    }
+		this.translationLoader = translationLoader;
+	}
 
-    @Override
+	@Override
 	protected Pair<String, ItemCategory> parseObject(JSONObject o) throws JSONException {
 		final String id = o.getString(JsonFieldNames.ItemCategory.itemCategoryID);
 		ItemCategory result = new ItemCategory(
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java
index e70f69eba..374ef8ba2 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTraitsParser.java
@@ -43,15 +43,15 @@ public final class ItemTraitsParser {
 			}
 		};
 	}
-	
+
 	public ItemTraits_OnUse parseItemTraits_OnUse(JSONObject o) throws JSONException {
 		if (o == null) return null;
-		
+
 		ConstRange boostCurrentHP = ResourceParserUtils.parseConstRange(o.optJSONObject(JsonFieldNames.ItemTraits_OnUse.increaseCurrentHP));
 		ConstRange boostCurrentAP = ResourceParserUtils.parseConstRange(o.optJSONObject(JsonFieldNames.ItemTraits_OnUse.increaseCurrentAP));
 		ActorConditionEffect[] addedConditions_source = actorConditionEffectParser_withDuration.parseArray(o.optJSONArray(JsonFieldNames.ItemTraits_OnUse.conditionsSource));
 		ActorConditionEffect[] addedConditions_target = actorConditionEffectParser_withDuration.parseArray(o.optJSONArray(JsonFieldNames.ItemTraits_OnUse.conditionsTarget));
-		if (       boostCurrentHP == null
+		if (	   boostCurrentHP == null
 				&& boostCurrentAP == null
 				&& addedConditions_source == null
 				&& addedConditions_target == null
@@ -72,10 +72,10 @@ public final class ItemTraitsParser {
 					);
 		}
 	}
-	
+
 	public ItemTraits_OnEquip parseItemTraits_OnEquip(JSONObject o) throws JSONException {
 		if (o == null) return null;
-		
+
 		AbilityModifierTraits stats = ResourceParserUtils.parseAbilityModifierTraits(o);
 		ActorConditionEffect[] addedConditions = actorConditionEffectParser_withoutDuration.parseArray(o.optJSONArray(JsonFieldNames.ItemTraits_OnEquip.addedConditions));
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
index 70fcf7b29..5aa26cbc8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ItemTypeParser.java
@@ -16,18 +16,18 @@ import org.json.JSONObject;
 public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 
 	private final DynamicTileLoader tileLoader;
-    private final TranslationLoader translationLoader;
-    private final ItemTraitsParser itemTraitsParser;
+	private final TranslationLoader translationLoader;
+	private final ItemTraitsParser itemTraitsParser;
 	private final ItemCategoryCollection itemCategories;
-	
+
 	public ItemTypeParser(
-            DynamicTileLoader tileLoader,
-            ActorConditionTypeCollection actorConditionsTypes,
-            ItemCategoryCollection itemCategories,
-            TranslationLoader translationLoader) {
+			DynamicTileLoader tileLoader,
+			ActorConditionTypeCollection actorConditionsTypes,
+			ItemCategoryCollection itemCategories,
+			TranslationLoader translationLoader) {
 		this.tileLoader = tileLoader;
-        this.translationLoader = translationLoader;
-        this.itemTraitsParser = new ItemTraitsParser(actorConditionsTypes);
+		this.translationLoader = translationLoader;
+		this.itemTraitsParser = new ItemTraitsParser(actorConditionsTypes);
 		this.itemCategories = itemCategories;
 	}
 
@@ -40,22 +40,22 @@ public final class ItemTypeParser extends JsonCollectionParserFor<ItemType> {
 		final ItemTraits_OnUse useEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.useEffect));
 		final ItemTraits_OnUse hitEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.hitEffect));
 		final ItemTraits_OnUse killEffect = itemTraitsParser.parseItemTraits_OnUse(o.optJSONObject(JsonFieldNames.ItemType.killEffect));
-		
+
 		final int baseMarketCost = o.optInt(JsonFieldNames.ItemType.baseMarketCost);
 		final boolean hasManualPrice = o.optInt(JsonFieldNames.ItemType.hasManualPrice, 0) > 0;
 		final ItemType itemType = new ItemType(
 				id
-    			, ResourceParserUtils.parseImageID(tileLoader, o.getString(JsonFieldNames.ItemType.iconID))
-    			, itemTypeName
-                , description
-	        	, itemCategories.getItemCategory(o.getString(JsonFieldNames.ItemType.category))
-    			, ItemType.DisplayType.fromString(o.optString(JsonFieldNames.ItemType.displaytype, null), ItemType.DisplayType.ordinary)
-    			, hasManualPrice
-    			, baseMarketCost
-    			, equipEffect
-    			, useEffect
-    			, hitEffect
-    			, killEffect
+				, ResourceParserUtils.parseImageID(tileLoader, o.getString(JsonFieldNames.ItemType.iconID))
+				, itemTypeName
+				, description
+				, itemCategories.getItemCategory(o.getString(JsonFieldNames.ItemType.category))
+				, ItemType.DisplayType.fromString(o.optString(JsonFieldNames.ItemType.displaytype, null), ItemType.DisplayType.ordinary)
+				, hasManualPrice
+				, baseMarketCost
+				, equipEffect
+				, useEffect
+				, hitEffect
+				, killEffect
 			);
 		return new Pair<String, ItemType>(id, itemType);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/MonsterTypeParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/MonsterTypeParser.java
index 42921dbfe..0a69d504e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/MonsterTypeParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/MonsterTypeParser.java
@@ -22,15 +22,15 @@ public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType
 	private final DropListCollection droplists;
 	private final ItemTraitsParser itemTraitsParser;
 	private final DynamicTileLoader tileLoader;
-    private final TranslationLoader translationLoader;
+	private final TranslationLoader translationLoader;
 
-    public MonsterTypeParser(
-            final DropListCollection droplists,
-            final ActorConditionTypeCollection actorConditionTypes,
-            final DynamicTileLoader tileLoader,
-            final TranslationLoader translationLoader) {
-        this.translationLoader = translationLoader;
-        this.itemTraitsParser = new ItemTraitsParser(actorConditionTypes);
+	public MonsterTypeParser(
+			final DropListCollection droplists,
+			final ActorConditionTypeCollection actorConditionTypes,
+			final DynamicTileLoader tileLoader,
+			final TranslationLoader translationLoader) {
+		this.translationLoader = translationLoader;
+		this.itemTraitsParser = new ItemTraitsParser(actorConditionTypes);
 		this.droplists = droplists;
 		this.tileLoader = tileLoader;
 	}
@@ -78,7 +78,7 @@ public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType
 				, hitEffect == null ? null : new ItemTraits_OnUse[] { hitEffect }
 		));
 	}
-	
+
 	private static float div100(int v) {
 		return (float) v / 100f;
 	}
@@ -90,11 +90,11 @@ public final class MonsterTypeParser extends JsonCollectionParserFor<MonsterType
 			float criticalMultiplier,
 			int blockChance,
 			int damageResistance,
-			ItemTraits_OnUse hitEffect, 
-			final int maxHP, 
+			ItemTraits_OnUse hitEffect,
+			final int maxHP,
 			final int maxAP) {
 		final float averageDamage = damagePotential != null ? damagePotential.averagef() : 0;
-		final float avgAttackHP  = getAttacksPerTurn(maxAP, attackCost) * div100(attackChance) * averageDamage * (1 + div100(criticalSkill) * criticalMultiplier);
+		final float avgAttackHP = getAttacksPerTurn(maxAP, attackCost) * div100(attackChance) * averageDamage * (1 + div100(criticalSkill) * criticalMultiplier);
 		final float avgDefenseHP = maxHP * (1 + div100(blockChance)) + Constants.EXP_FACTOR_DAMAGERESISTANCE * damageResistance;
 		int attackConditionBonus = 0;
 		if (hitEffect != null && hitEffect.addedConditions_target != null && hitEffect.addedConditions_target.length > 0) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
index 2ab18c6d9..e9dd8d0e0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/QuestParser.java
@@ -14,9 +14,9 @@ import java.util.Arrays;
 import java.util.Comparator;
 
 public final class QuestParser extends JsonCollectionParserFor<Quest> {
-    private final TranslationLoader translationLoader;
-    private int sortOrder = 0;
-	
+	private final TranslationLoader translationLoader;
+	private int sortOrder = 0;
+
 	private final JsonArrayParserFor<QuestLogEntry> questLogEntryParser = new JsonArrayParserFor<QuestLogEntry>(QuestLogEntry.class) {
 		@Override
 		protected QuestLogEntry parseObject(JSONObject o) throws JSONException {
@@ -35,11 +35,11 @@ public final class QuestParser extends JsonCollectionParserFor<Quest> {
 		}
 	};
 
-    public QuestParser(TranslationLoader translationLoader) {
-        this.translationLoader = translationLoader;
-    }
+	public QuestParser(TranslationLoader translationLoader) {
+		this.translationLoader = translationLoader;
+	}
 
-    @Override
+	@Override
 	protected Pair<String, Quest> parseObject(JSONObject o) throws JSONException {
 		final String id = o.getString(JsonFieldNames.Quest.questID);
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java
index f94d0c60c..f0ea5a96e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/ResourceParserUtils.java
@@ -13,21 +13,21 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 public final class ResourceParserUtils {
-	
+
 	public static int parseImageID(DynamicTileLoader tileLoader, String s) {
-	   	String[] parts = s.split(":");
-	   	return tileLoader.prepareTileID(parts[0], Integer.parseInt(parts[1]));
+		String[] parts = s.split(":");
+		return tileLoader.prepareTileID(parts[0], Integer.parseInt(parts[1]));
 	}
 
 	private static final Size size1x1 = new Size(1, 1);
 	public static Size parseSize(String s, final Size defaultSize) {
 		if (s == null || s.length() <= 0) return defaultSize;
 		if (s.equals("1x1")) return size1x1;
-	   	String[] parts = s.split("x");
-	   	if (parts.length < 2) return defaultSize;
-	   	return new Size(Integer.parseInt(parts[0]), Integer.parseInt(parts[1]));
+		String[] parts = s.split("x");
+		if (parts.length < 2) return defaultSize;
+		return new Size(Integer.parseInt(parts[0]), Integer.parseInt(parts[1]));
 	}
-	
+
 	public static int parseInt(String s, int defaultValue) {
 		if (s == null || s.length() <= 0) return defaultValue;
 		return Integer.parseInt(s);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
index 18f30468b..04d128cf9 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/parsers/WorldMapParser.java
@@ -21,7 +21,7 @@ public final class WorldMapParser {
 	public static void read(Resources r, int xmlResourceId, final MapCollection maps) {
 		read(r.getXml(xmlResourceId), maps);
 	}
-	
+
 	private static void read(XmlResourceParser xrp, final MapCollection maps) {
 		try {
 			int eventType;
@@ -31,10 +31,10 @@ public final class WorldMapParser {
 					if (s.equals("segment")) {
 						WorldMapSegment segment = parseSegment(xrp, maps);
 						maps.worldMapSegments.put(segment.name, segment);
-					} 
+					}
 				}
-            }
-            xrp.close();
+			}
+			xrp.close();
 		} catch (Exception e) {
 			L.log("Error reading worldmap: " + e.toString());
 		}
@@ -43,7 +43,7 @@ public final class WorldMapParser {
 	private static WorldMapSegment parseSegment(XmlResourceParser xrp, final MapCollection maps) throws XmlPullParserException, IOException {
 		String segmentName = xrp.getAttributeValue(null, "id");
 		final WorldMapSegment segment = new WorldMapSegment(segmentName);
-		
+
 		final ArrayList<Pair<String, String>> mapsInNamedAreas = new ArrayList<Pair<String,String>>();
 		XmlResourceParserUtils.readCurrentTagUntilEnd(xrp, new XmlResourceParserUtils.TagHandler() {
 			@Override
@@ -57,7 +57,7 @@ public final class WorldMapParser {
 						);
 					WorldMapSegmentMap map = new WorldMapSegmentMap(mapName, mapPosition);
 					segment.maps.put(mapName, map);
-					
+
 					String namedArea = xrp.getAttributeValue(null, "area");
 					if (namedArea != null) mapsInNamedAreas.add(new Pair<String, String>(mapName, namedArea));
 				} else if (tagName.equals("namedarea")) {
@@ -68,11 +68,11 @@ public final class WorldMapParser {
 				}
 			}
 		});
-		
+
 		for (Pair<String, String> m : mapsInNamedAreas) {
 			segment.namedAreas.get(m.second).mapNames.add(m.first);
 		}
-		
+
 		return segment;
 	}
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java
index c73bc7f1f..e51c9802b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/ResourceFileTileset.java
@@ -13,34 +13,34 @@ public final class ResourceFileTileset {
 	public final Size numTiles;
 	public Size sourceTileSize;
 	public Matrix scale;
-	
+
 	public ResourceFileTileset(int resourceID, String tilesetName, Size numTiles, Size destinationTileSize) {
 		this.resourceID = resourceID;
 		this.tilesetName = tilesetName;
 		this.destinationTileSize = destinationTileSize;
 		this.numTiles = numTiles;
 	}
-	
+
 	@Override public int hashCode() { return resourceID; }
-	
+
 	public void calculateFromSourceImageSize(final int sourceWidth, final int sourceHeight) {
 		sourceTileSize = new Size(
-        		sourceWidth / numTiles.width
-        		,sourceHeight / numTiles.height
-    		);
-		
+				sourceWidth / numTiles.width
+				,sourceHeight / numTiles.height
+			);
+
 		if (destinationTileSize.width == sourceTileSize.width && destinationTileSize.height == sourceTileSize.height) {
 			scale = null;
 		} else {
-	        scale = new Matrix();
-	        scale.postScale(
-	        		((float) destinationTileSize.width) / sourceTileSize.width
-	    			,((float) destinationTileSize.height) / sourceTileSize.height
+			scale = new Matrix();
+			scale.postScale(
+					((float) destinationTileSize.width) / sourceTileSize.width
+					,((float) destinationTileSize.height) / sourceTileSize.height
 				);
-        
-	        if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
-		        //L.log("OPTIMIZE: Tileset " + tilesetName + " will be resized from " + sourceTileSize.toString() + " to " + destinationTileSize.toString());
-	        }
+
+			if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
+				//L.log("OPTIMIZE: Tileset " + tilesetName + " will be resized from " + sourceTileSize.toString() + " to " + destinationTileSize.toString());
+			}
 		}
 	}
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java
index 9e3ee595d..05fc4ad2f 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCache.java
@@ -16,18 +16,18 @@ import android.util.SparseIntArray;
 
 public final class TileCache {
 
-	private final ReferenceQueue<Bitmap> gcQueue = new ReferenceQueue<Bitmap>(); 
+	private final ReferenceQueue<Bitmap> gcQueue = new ReferenceQueue<Bitmap>();
 	private ResourceFileTile[] resourceTiles = new ResourceFileTile[1];
 	private final HashMap<String, SparseIntArray> tileIDsPerTilesetAndLocalID = new HashMap<String, SparseIntArray>();
-	private final LruCache<Integer, Bitmap> cache = new LruCache<Integer, Bitmap>(1000); 
-	
+	private final LruCache<Integer, Bitmap> cache = new LruCache<Integer, Bitmap>(1000);
+
 	public int getMaxTileID() { return resourceTiles.length-1; }
 	public void allocateMaxTileID(int maxTileID) {
-        if (maxTileID <= 0) return;
-        
-        ResourceFileTile[] oldArray = resourceTiles;
-        resourceTiles = new ResourceFileTile[maxTileID+1];
-        System.arraycopy(oldArray, 0, resourceTiles, 0, oldArray.length);
+		if (maxTileID <= 0) return;
+
+		ResourceFileTile[] oldArray = resourceTiles;
+		resourceTiles = new ResourceFileTile[maxTileID+1];
+		System.arraycopy(oldArray, 0, resourceTiles, 0, oldArray.length);
 	}
 	public void setTile(int tileID, ResourceFileTileset tileset, int localID) {
 		if (resourceTiles[tileID] == null) resourceTiles[tileID] = new ResourceFileTile(tileset, localID);
@@ -41,7 +41,7 @@ public final class TileCache {
 	public int getTileID(String tileSetName, int localID) {
 		return tileIDsPerTilesetAndLocalID.get(tileSetName).get(localID);
 	}
-	
+
 	private static final class ResourceFileTile {
 		public final ResourceFileTileset tileset;
 		public final int localID;
@@ -51,7 +51,7 @@ public final class TileCache {
 			this.localID = localID;
 		}
 	}
-	
+
 	private void cleanQueue() {
 		System.gc();
 		Reference<? extends Bitmap> ref;
@@ -60,7 +60,7 @@ public final class TileCache {
 			if (b != null) b.recycle();
 		}
 	}
-	
+
 	public TileCollection loadTilesFor(Collection<Integer> iconIDs, Resources r) { return loadTilesFor(iconIDs, r, null); }
 	public TileCollection loadTilesFor(Collection<Integer> iconIDs, Resources r, TileCollection result) {
 		int maxTileID = 0;
@@ -75,45 +75,45 @@ public final class TileCache {
 			tiles.put(tileID, tile);
 			maxTileID = Math.max(maxTileID, tileID);
 		}
-		
+
 		boolean hasLoadedTiles = false;
 		if (result == null) result = new TileCollection(maxTileID);
 		for(Entry<ResourceFileTileset, SparseArray<ResourceFileTile>> e : tilesToLoadPerSourceFile.entrySet()) {
 			TileCutter cutter = null;
-			
+
 			SparseArray<ResourceFileTile> tilesToLoad = e.getValue();
 			for (int i = 0; i < tilesToLoad.size(); ++i) {
 				int tileID = tilesToLoad.keyAt(i);
 				ResourceFileTile tile = tilesToLoad.valueAt(i);
-				
+
 				Bitmap bitmap = cache.get(tileID);
-				
+
 				if (bitmap == null) {
 					if (cutter == null) {
 						if (!hasLoadedTiles) cleanQueue();
 						cutter = new TileCutter(e.getKey(), r);
 						hasLoadedTiles = true;
 					}
-					
+
 					bitmap = cutter.createTile(tile.localID);
 					cache.put(tileID, bitmap);
 					new WeakReference<Bitmap>(bitmap, gcQueue);
 				}
 				result.setBitmap(tileID, bitmap);
 			}
-			
+
 			if (cutter != null) cutter.recycle();
 		}
 		if (hasLoadedTiles) cleanQueue();
 		return result;
 	}
-	
+
 	public Bitmap loadSingleTile(int tileID, Resources r) {
 		cleanQueue();
 		ResourceFileTile tile = resourceTiles[tileID];
 		Bitmap bitmap = cache.get(tileID);
 		if (bitmap != null) return bitmap;
-		
+
 		TileCutter cutter = new TileCutter(tile.tileset, r);
 		Bitmap result = cutter.createTile(tile.localID);
 		cutter.recycle();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCollection.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCollection.java
index 3f5e3b9a8..189a2b646 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCollection.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCollection.java
@@ -7,18 +7,18 @@ import android.graphics.Paint;
 public final class TileCollection {
 	private final Bitmap[] bitmaps;
 	public final int maxTileID;
-	
+
 	public TileCollection(int maxTileID) {
 		this.bitmaps = new Bitmap[maxTileID+1];
 		this.maxTileID = maxTileID;
 	}
 
-	public Bitmap getBitmap(int tileID) { 
-		return bitmaps[tileID]; 
+	public Bitmap getBitmap(int tileID) {
+		return bitmaps[tileID];
 	}
-	
+
 	public void setBitmap(int tileID, Bitmap bitmap) {
-		bitmaps[tileID] = bitmap; 
+		bitmaps[tileID] = bitmap;
 	}
 
 	public void drawTile(Canvas canvas, int tile, int px, int py, Paint mPaint) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCutter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCutter.java
index 442191577..b8efddd81 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCutter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileCutter.java
@@ -9,12 +9,12 @@ public final class TileCutter {
 	private final ResourceFileTileset sourceFile;
 	private final Bitmap tilesetImage;
 	private boolean recycle = true;
-	
+
 	public TileCutter(ResourceFileTileset sourceFile, Resources r) {
 		this.sourceFile = sourceFile;
 		this.tilesetImage = createTilesetImage(r);
 	}
-	
+
 	private Bitmap createTilesetImage(Resources r) {
 		//return BitmapFactory.decodeResource(r, b.resourceId);
 		Options o = new Options();
@@ -39,7 +39,7 @@ public final class TileCutter {
 		if (result == tilesetImage) recycle = false;
 		return result;
 	}
-	
+
 	public void recycle() {
 		if (recycle) tilesetImage.recycle();
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
index 415a73535..ae747b949 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/resource/tiles/TileManager.java
@@ -55,27 +55,27 @@ public final class TileManager {
 	public static final int iconID_splatter_white_1a = 18;
 	public static final int iconID_splatter_white_1b = 19;
 
-    public int tileSize;
+	public int tileSize;
 
 	public int viewTileSize;
-    public float scale;
+	public float scale;
 
-    
-    public final TileCache tileCache = new TileCache();
+
+	public final TileCache tileCache = new TileCache();
 	public final TileCollection preloadedTiles = new TileCollection(97);
 	public TileCollection currentMapTiles;
 	public TileCollection adjacentMapTiles;
 	private final HashSet<Integer> preloadedTileIDs = new HashSet<Integer>();
-	
-	
+
+
 	public TileCollection loadTilesFor(HashSet<Integer> tileIDs, Resources r) {
 		return tileCache.loadTilesFor(tileIDs, r);
 	}
-	
+
 	public TileCollection loadTilesFor(ItemContainer container, Resources r) {
 		return tileCache.loadTilesFor(getTileIDsFor(container), r);
 	}
-	
+
 	public HashSet<Integer> getTileIDsFor(ItemContainer container) {
 		HashSet<Integer> iconIDs = new HashSet<Integer>();
 		for(ItemEntry i : container.items) {
@@ -83,7 +83,7 @@ public final class TileManager {
 		}
 		return iconIDs;
 	}
-	
+
 	public TileCollection loadTilesFor(Inventory inventory, Resources r) {
 		HashSet<Integer> iconIDs = getTileIDsFor(inventory);
 		for (Inventory.WearSlot slot : Inventory.WearSlot.values()) {
@@ -92,7 +92,7 @@ public final class TileManager {
 		}
 		return tileCache.loadTilesFor(iconIDs, r);
 	}
-	
+
 	public TileCollection loadTilesFor(PredefinedMap map, LayeredTileMap tileMap, WorldContext world, Resources r) {
 		HashSet<Integer> iconIDs = getTileIDsFor(map, tileMap, world);
 		TileCollection result = tileCache.loadTilesFor(iconIDs, r);
@@ -101,7 +101,7 @@ public final class TileManager {
 		}
 		return result;
 	}
-	
+
 	public HashSet<Integer> getTileIDsFor(PredefinedMap map, LayeredTileMap tileMap, WorldContext world) {
 		HashSet<Integer> iconIDs = new HashSet<Integer>();
 		for (MonsterSpawnArea a : map.spawnAreas) {
@@ -118,19 +118,19 @@ public final class TileManager {
 		iconIDs.addAll(tileMap.usedTileIDs);
 		return iconIDs;
 	}
-	
+
 	public void setDensity(Resources r) {
-        float density = r.getDisplayMetrics().density;
+		float density = r.getDisplayMetrics().density;
 		tileSize = (int) (32 * density);
 	}
-	
+
 	public void updatePreferences(AndorsTrailPreferences prefs) {
 		scale = prefs.scalingFactor;
-        viewTileSize = (int) (tileSize * prefs.scalingFactor);
+		viewTileSize = (int) (tileSize * prefs.scalingFactor);
 	}
-	
-	
-	
+
+
+
 	public void setImageViewTile(Resources res, TextView textView, Monster monster) { setImageViewTileForMonster(res, textView, monster.iconID); }
 	public void setImageViewTile(Resources res, TextView textView, Player player) { setImageViewTileForPlayer(res, textView, player.iconID); }
 	public void setImageViewTileForMonster(Resources res, TextView textView, int iconID) { setImageViewTile(res, textView, currentMapTiles.getBitmap(iconID)); }
@@ -160,7 +160,7 @@ public final class TileManager {
 			setImageViewTile(res, textView, icon);
 		}
 	}
-	
+
 	public void setImageViewTile(ImageView imageView, Monster monster) { setImageViewTileForMonster(imageView, monster.iconID); }
 	public void setImageViewTile(ImageView imageView, Player player) { setImageViewTileForPlayer(imageView, player.iconID); }
 	public void setImageViewTileForMonster(ImageView imageView, int iconID) { imageView.setImageBitmap(currentMapTiles.getBitmap(iconID)); }
@@ -198,10 +198,10 @@ public final class TileManager {
 				throw new IndexOutOfBoundsException("ERROR: TileManager.preloadedTiles needs to be initialized with at least " + maxTileID + " slots. Application will crash now.");
 			}
 		}
-        for(int i = TileManager.CHAR_HERO; i <= maxTileID; ++i) {
-        	preloadedTileIDs.add(i);
-        }
-        tileCache.loadTilesFor(preloadedTileIDs, r, preloadedTiles);
+		for(int i = TileManager.CHAR_HERO; i <= maxTileID; ++i) {
+			preloadedTileIDs.add(i);
+		}
+		tileCache.loadTilesFor(preloadedTileIDs, r, preloadedTiles);
 	}
 
 	private final HashMap<String, HashSet<Integer>> tileIDsPerMap = new HashMap<String, HashSet<Integer>>();
@@ -217,23 +217,23 @@ public final class TileManager {
 		dest.addAll(cachedTileIDs);
 	}
 	public void cacheAdjacentMaps(final Resources res, final WorldContext world, final PredefinedMap nextMap) {
-		(new AsyncTask<Void, Void, Void>()  {
+		(new AsyncTask<Void, Void, Void>() {
 			@Override
 			protected Void doInBackground(Void... arg0) {
 				adjacentMapTiles = null;
-				
+
 				HashSet<String> adjacentMapNames = new HashSet<String>();
 				for (MapObject o : nextMap.eventObjects) {
 					if (o.type != MapObject.MapObjectType.newmap) continue;
 					if (o.map == null) continue;
 					adjacentMapNames.add(o.map);
 				}
-				
+
 				HashSet<Integer> tileIDs = new HashSet<Integer>();
 				for (String mapName : adjacentMapNames) {
 					addTileIDsFor(tileIDs, mapName, res, world);
 				}
-				
+
 				adjacentMapTiles = tileCache.loadTilesFor(tileIDs, res);
 				return null;
 			}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java
index 1294ff480..a5f50497c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForItemContainer.java
@@ -15,7 +15,7 @@ public final class LegacySavegameFormatReaderForItemContainer {
 	public static void refundUpgradedItems(Loot loot) {
 		loot.gold += getRefundForUpgradedItems(loot.items);
 	}
-	
+
 	private static int getRefundForUpgradedItems(ItemContainer container) {
 		int removedCost = 0;
 		for (ItemEntry e : container.items) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
index 6e0da78c5..f793dadcb 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/LegacySavegameFormatReaderForPlayer.java
@@ -17,7 +17,7 @@ import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
 import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class LegacySavegameFormatReaderForPlayer {
-	
+
 	public static void readQuestProgressPreV13(Player player, DataInputStream src, WorldContext world, int fileversion) throws IOException {
 		final int size1 = src.readInt();
 		for(int i = 0; i < size1; ++i) {
@@ -66,9 +66,9 @@ public final class LegacySavegameFormatReaderForPlayer {
 	private static void addQuestProgress(Player player, String questID, int progress) {
 		player.addQuestProgress(new QuestProgress(questID, progress));
 	}
-	
+
 	public static void upgradeSavegame(Player player, WorldContext world, ControllerContext controllers, int fileversion) {
-		
+
 		if (fileversion <= 12) {
 			player.useItemCost = 5;
 			player.health.max += 5;
@@ -83,18 +83,18 @@ public final class LegacySavegameFormatReaderForPlayer {
 			}
 			player.availableSkillIncreases = getExpectedNumberOfSkillpointsForLevel(player.getLevel()) - assignedSkillpoints;
 		}
-		
+
 		if (fileversion <= 21) {
 			if (player.hasExactQuestProgress("prim_hunt", 240)) player.addQuestProgress(new QuestProgress("bwm_agent", 250));
 			if (player.hasExactQuestProgress("bwm_agent", 240)) player.addQuestProgress(new QuestProgress("prim_hunt", 250));
 		}
-		
+
 		if (fileversion <= 27) {
 			correctActorConditionsFromItemsPre0611b1(player, "bless", world, controllers, "elytharan_redeemer");
 			correctActorConditionsFromItemsPre0611b1(player, "blackwater_misery", world, controllers, "bwm_dagger");
 			correctActorConditionsFromItemsPre0611b1(player, "regen", world, controllers, "ring_shadow0");
 		}
-		
+
 		if (fileversion <= 30) {
 			player.baseTraits.attackCost = Player.DEFAULT_PLAYER_ATTACKCOST;
 		}
@@ -105,7 +105,7 @@ public final class LegacySavegameFormatReaderForPlayer {
 			}
 		}
 	}
-	
+
 	public static int getExpectedNumberOfSkillpointsForLevel(int level) {
 		level -= Constants.FIRST_SKILL_POINT_IS_GIVEN_AT_LEVEL;
 		if (level < 0) return 0;
@@ -127,7 +127,7 @@ public final class LegacySavegameFormatReaderForPlayer {
 			}
 		}
 		if (hasItemWithCondition) return;
-		
+
 		controllers.actorStatsController.removeConditionsFromUnequippedItem(player, world.itemTypes.getItemType(itemTypeIDWithCondition));
 	}
 
@@ -135,7 +135,7 @@ public final class LegacySavegameFormatReaderForPlayer {
 		if (fileversion >= 25) {
 			if (!src.readBoolean()) return;
 		}
-		
+
 		/*attackCost = */src.readInt();
 		/*attackChance = */src.readInt();
 		/*criticalSkill = */src.readInt();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
index 53de14ff2..8a5eb4bc0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/savegames/Savegames.java
@@ -31,11 +31,11 @@ import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class Savegames {
 	public static final int SLOT_QUICKSAVE = 0;
-	
+
 	public static final int LOAD_RESULT_SUCCESS = 0;
 	public static final int LOAD_RESULT_UNKNOWN_ERROR = 1;
 	public static final int LOAD_RESULT_FUTURE_VERSION = 2;
-	
+
 	public static boolean saveWorld(WorldContext world, Context androidContext, int slot, String displayInfo) {
 		try {
 			// Create the savegame in a temporary memorystream first to ensure that the savegame can
@@ -44,7 +44,7 @@ public final class Savegames {
 			saveWorld(world, bos, displayInfo);
 			byte[] savegame = bos.toByteArray();
 			bos.close();
-			
+
 			FileOutputStream fos = getOutputFile(androidContext, slot);
 			fos.write(savegame);
 			fos.close();
@@ -71,7 +71,7 @@ public final class Savegames {
 			return LOAD_RESULT_UNKNOWN_ERROR;
 		}
 	}
-	
+
 	private static FileOutputStream getOutputFile(Context androidContext, int slot) throws IOException {
 		if (slot == SLOT_QUICKSAVE) {
 			return androidContext.openFileOutput(Constants.FILENAME_SAVEGAME_QUICKSAVE, Context.MODE_PRIVATE);
@@ -96,12 +96,12 @@ public final class Savegames {
 		File root = getSavegameDirectory();
 		return new File(root, Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + slot);
 	}
-	
+
 	private static File getSavegameDirectory() {
 		File root = Environment.getExternalStorageDirectory();
 		return new File(root, Constants.FILENAME_SAVEGAME_DIRECTORY);
 	}
-	
+
 	public static void saveWorld(WorldContext world, OutputStream outStream, String displayInfo) throws IOException {
 		DataOutputStream dest = new DataOutputStream(outStream);
 		final int flags = 0;
@@ -110,28 +110,28 @@ public final class Savegames {
 		world.model.writeToParcel(dest, flags);
 		dest.close();
 	}
-	
+
 	public static int loadWorld(Resources res, WorldContext world, ControllerContext controllers, InputStream inState) throws IOException {
 		DataInputStream src = new DataInputStream(inState);
 		final FileHeader header = new FileHeader(src);
 		if (header.fileversion > AndorsTrailApplication.CURRENT_VERSION) return LOAD_RESULT_FUTURE_VERSION;
-		
+
 		world.maps.readFromParcel(src, world, controllers, header.fileversion);
 		world.model = new ModelContainer(src, world, controllers, header.fileversion);
 		src.close();
-		
+
 		onWorldLoaded(res, world, controllers);
-		
+
 		return LOAD_RESULT_SUCCESS;
 	}
-	
+
 	private static void onWorldLoaded(Resources res, WorldContext world, ControllerContext controllers) {
 		controllers.actorStatsController.recalculatePlayerStats(world.model.player);
 		controllers.mapController.resetMapsNotRecentlyVisited();
 		controllers.movementController.prepareMapAsCurrentMap(world.model.currentMap, res, false);
 		controllers.gameRoundController.resetRoundTimers();
 	}
-	
+
 	public static FileHeader quickload(Context androidContext, int slot) {
 		try {
 			if (slot != SLOT_QUICKSAVE) {
@@ -148,7 +148,7 @@ public final class Savegames {
 			return null;
 		}
 	}
-	
+
 	private static final Pattern savegameFilenamePattern = Pattern.compile(Constants.FILENAME_SAVEGAME_FILENAME_PREFIX + "(\\d+)");
 	public static List<Integer> getUsedSavegameSlots(Context androidContext) {
 		try {
@@ -170,23 +170,23 @@ public final class Savegames {
 			return null;
 		}
 	}
-	
+
 	public static final class FileHeader {
 		public final int fileversion;
 		public final String playerName;
 		public final String displayInfo;
-		
+
 		public FileHeader(String playerName, String displayInfo) {
 			this.fileversion = AndorsTrailApplication.CURRENT_VERSION;
 			this.playerName = playerName;
 			this.displayInfo = displayInfo;
 		}
-		
+
 		public String describe() {
 			return playerName + ", " + displayInfo;
 		}
 
-			
+
 		// ====== PARCELABLE ===================================================================
 
 		public FileHeader(DataInputStream src) throws IOException {
@@ -201,7 +201,7 @@ public final class Savegames {
 				this.displayInfo = null;
 			}
 		}
-		
+
 		public static void writeToParcel(DataOutputStream dest, String playerName, String displayInfo) throws IOException {
 			dest.writeInt(AndorsTrailApplication.CURRENT_VERSION);
 			dest.writeUTF(playerName);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Base64.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Base64.java
index a72d2b34f..f44c09498 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Base64.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Base64.java
@@ -18,7 +18,7 @@ public final class Base64 {
 
 	/**
 	 * encode the input data producong a base 64 encoded byte array.
-	 * 
+	 *
 	 * @return a byte array containing the base 64 encoded data.
 	 */
 	public static byte[] encode(byte[] data) {
@@ -95,7 +95,7 @@ public final class Base64 {
 
 	/**
 	 * decode the base 64 encoded input data.
-	 * 
+	 *
 	 * @return a byte array representing the decoded data.
 	 */
 	public static byte[] decode(byte[] data) {
@@ -141,7 +141,7 @@ public final class Base64 {
 
 	/**
 	 * decode the base 64 encoded String data.
-	 * 
+	 *
 	 * @return a byte array representing the decoded data.
 	 */
 	public static byte[] decode(String data) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ConstRange.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ConstRange.java
index 9440e1cb9..3a257f3a8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ConstRange.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ConstRange.java
@@ -5,12 +5,12 @@ import android.util.FloatMath;
 public final class ConstRange {
 	public final int max;
 	public final int current;
-	
-	public ConstRange(Range r) { 
+
+	public ConstRange(Range r) {
 		this.max = r.max;
 		this.current = r.current;
 	}
-	public ConstRange(ConstRange r) { 
+	public ConstRange(ConstRange r) {
 		this.max = r.max;
 		this.current = r.current;
 	}
@@ -18,15 +18,15 @@ public final class ConstRange {
 		this.max = max;
 		this.current = current;
 	}
-	
+
 	public String toString() { return current + "/" + max; }
 	public String toMinMaxString() {
 		if (isMax()) return Integer.toString(max);
-		else return current + "-" + max; 
+		else return current + "-" + max;
 	}
 	public String toMinMaxAbsString() {
 		if (isMax()) return Integer.toString(Math.abs(max));
-		else return Math.abs(current) + "-" + Math.abs(max); 
+		else return Math.abs(current) + "-" + Math.abs(max);
 	}
 	public boolean isMax() { return max == current;	}
 	public int average() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Coord.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Coord.java
index f05f77783..b611ede0e 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Coord.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Coord.java
@@ -10,7 +10,7 @@ public final class Coord {
 	public Coord() {}
 	public Coord(int x, int y) { this.x = x; this.y = y; }
 	public Coord(Coord p) { this.x = p.x; this.y = p.y; }
-	
+
 	public String toString() { return "(" + x + ',' + y + ')'; }
 	public void set(int x, int y) { this.x = x; this.y = y; }
 	public void set(Coord r) {
@@ -30,9 +30,9 @@ public final class Coord {
 		if (Math.abs(dy) > 1) return false;
 		return true;
 	}
-	
-	
-	
+
+
+
 	// ====== PARCELABLE ===================================================================
 
 	public Coord(DataInputStream src, int fileversion) throws IOException {
@@ -42,7 +42,7 @@ public final class Coord {
 		this.x = src.readInt();
 		this.y = src.readInt();
 	}
-	
+
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
 		dest.writeInt(x);
 		dest.writeInt(y);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
index 87dd5e2d7..b74f80833 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/CoordRect.java
@@ -29,7 +29,7 @@ public final class CoordRect {
 		if (y - topLeft.y >= size.height) return false;
 		return true;
 	}
-	
+
 	/*
 	public static boolean contains(final int x, final int y, final Size size, final Coord p) {
 		if (p.x < x) return false;
@@ -47,7 +47,7 @@ public final class CoordRect {
 		if (topLeft.y >= a.topLeft.y + a.size.height) return false;
 		return true;
 	}
-	
+
 	public boolean isAdjacentTo(Coord p) {
 		final int dx = p.x - topLeft.x;
 		final int dy = p.y - topLeft.y;
@@ -68,7 +68,7 @@ public final class CoordRect {
 		center.y += size.height / 2;
 		return center;
 	}
-	
+
 	public String toString() {
 		return '{' + topLeft.toString() + ", " + size.toString() + '}';
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
index e61f4df31..60cfbe6e8 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/L.java
@@ -6,7 +6,7 @@ import android.util.Log;
 
 public final class L {
 	private static final String TAG = "AndorsTrail";
-	
+
 	public static void log(String s) {
 		if (AndorsTrailApplication.DEVELOPMENT_DEBUGMESSAGES) {
 			Log.d(TAG, s);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java
index a5f66db00..6a8e5b808 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/ListOfListeners.java
@@ -7,7 +7,7 @@ import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
 public class ListOfListeners<T> {
 	private final ArrayList<WeakReference<T>> listeners = new ArrayList<WeakReference<T>>();
-	
+
 	public final void add(T listener) {
 		if (AndorsTrailApplication.DEVELOPMENT_VALIDATEDATA) {
 			for (WeakReference<T> ref : listeners) {
@@ -26,10 +26,10 @@ public class ListOfListeners<T> {
 			}
 		}
 	}
-    public final void clear() {
-        listeners.clear();
-    }
-	
+	public final void clear() {
+		listeners.clear();
+	}
+
 	protected final void callAllListeners(Function<T> e) {
 		for (int i = listeners.size()-1; i >= 0; --i) {
 			T listener = listeners.get(i).get();
@@ -58,7 +58,7 @@ public class ListOfListeners<T> {
 			else e.call(listener, arg1, arg2, arg3);
 		}
 	}
-	
+
 	protected static interface Function<Listener> {
 		public void call(Listener listener);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/LruCache.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/LruCache.java
index 8ddfabcdf..b9a25a39b 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/LruCache.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/LruCache.java
@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *	  http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,297 +27,297 @@ import java.util.Map;
  * overview.
  */
 public final class LruCache<K, V> {
-    private final LinkedHashMap<K, V> map;
+	private final LinkedHashMap<K, V> map;
 
-    /** Size of this cache in units. Not necessarily the number of elements. */
-    private int size;
-    private int maxSize;
+	/** Size of this cache in units. Not necessarily the number of elements. */
+	private int size;
+	private int maxSize;
 
-    private int putCount;
-    private int createCount;
-    private int evictionCount;
-    private int hitCount;
-    private int missCount;
+	private int putCount;
+	private int createCount;
+	private int evictionCount;
+	private int hitCount;
+	private int missCount;
 
-    /**
-     * @param maxSize for caches that do not override {@link #sizeOf}, this is
-     *     the maximum number of entries in the cache. For all other caches,
-     *     this is the maximum sum of the sizes of the entries in this cache.
-     */
-    public LruCache(int maxSize) {
-        if (maxSize <= 0) {
-            throw new IllegalArgumentException("maxSize <= 0");
-        }
-        this.maxSize = maxSize;
-        this.map = new LinkedHashMap<K, V>(0, 0.75f, true);
-    }
+	/**
+	 * @param maxSize for caches that do not override {@link #sizeOf}, this is
+	 *	 the maximum number of entries in the cache. For all other caches,
+	 *	 this is the maximum sum of the sizes of the entries in this cache.
+	 */
+	public LruCache(int maxSize) {
+		if (maxSize <= 0) {
+			throw new IllegalArgumentException("maxSize <= 0");
+		}
+		this.maxSize = maxSize;
+		this.map = new LinkedHashMap<K, V>(0, 0.75f, true);
+	}
 
-    /**
-     * Returns the value for {@code key} if it exists in the cache or can be
-     * created by {@code #create}. If a value was returned, it is moved to the
-     * head of the queue. This returns null if a value is not cached and cannot
-     * be created.
-     */
-    public final V get(K key) {
-        if (key == null) {
-            throw new NullPointerException("key == null");
-        }
+	/**
+	 * Returns the value for {@code key} if it exists in the cache or can be
+	 * created by {@code #create}. If a value was returned, it is moved to the
+	 * head of the queue. This returns null if a value is not cached and cannot
+	 * be created.
+	 */
+	public final V get(K key) {
+		if (key == null) {
+			throw new NullPointerException("key == null");
+		}
 
-        V mapValue;
-        synchronized (this) {
-            mapValue = map.get(key);
-            if (mapValue != null) {
-                hitCount++;
-                return mapValue;
-            }
-            missCount++;
-        }
+		V mapValue;
+		synchronized (this) {
+			mapValue = map.get(key);
+			if (mapValue != null) {
+				hitCount++;
+				return mapValue;
+			}
+			missCount++;
+		}
 
-        /*
-         * Attempt to create a value. This may take a long time, and the map
-         * may be different when create() returns. If a conflicting value was
-         * added to the map while create() was working, we leave that value in
-         * the map and release the created value.
-         */
+		/*
+		 * Attempt to create a value. This may take a long time, and the map
+		 * may be different when create() returns. If a conflicting value was
+		 * added to the map while create() was working, we leave that value in
+		 * the map and release the created value.
+		 */
 
-        V createdValue = create(key);
-        if (createdValue == null) {
-            return null;
-        }
+		V createdValue = create(key);
+		if (createdValue == null) {
+			return null;
+		}
 
-        synchronized (this) {
-            createCount++;
-            mapValue = map.put(key, createdValue);
+		synchronized (this) {
+			createCount++;
+			mapValue = map.put(key, createdValue);
 
-            if (mapValue != null) {
-                // There was a conflict so undo that last put
-                map.put(key, mapValue);
-            } else {
-                size += safeSizeOf(key, createdValue);
-            }
-        }
+			if (mapValue != null) {
+				// There was a conflict so undo that last put
+				map.put(key, mapValue);
+			} else {
+				size += safeSizeOf(key, createdValue);
+			}
+		}
 
-        if (mapValue != null) {
-            entryRemoved(false, key, createdValue, mapValue);
-            return mapValue;
-        } else {
-            trimToSize(maxSize);
-            return createdValue;
-        }
-    }
+		if (mapValue != null) {
+			entryRemoved(false, key, createdValue, mapValue);
+			return mapValue;
+		} else {
+			trimToSize(maxSize);
+			return createdValue;
+		}
+	}
 
-    /**
-     * Caches {@code value} for {@code key}. The value is moved to the head of
-     * the queue.
-     *
-     * @return the previous value mapped by {@code key}.
-     */
-    public final V put(K key, V value) {
-        if (key == null || value == null) {
-            throw new NullPointerException("key == null || value == null");
-        }
+	/**
+	 * Caches {@code value} for {@code key}. The value is moved to the head of
+	 * the queue.
+	 *
+	 * @return the previous value mapped by {@code key}.
+	 */
+	public final V put(K key, V value) {
+		if (key == null || value == null) {
+			throw new NullPointerException("key == null || value == null");
+		}
 
-        V previous;
-        synchronized (this) {
-            putCount++;
-            size += safeSizeOf(key, value);
-            previous = map.put(key, value);
-            if (previous != null) {
-                size -= safeSizeOf(key, previous);
-            }
-        }
+		V previous;
+		synchronized (this) {
+			putCount++;
+			size += safeSizeOf(key, value);
+			previous = map.put(key, value);
+			if (previous != null) {
+				size -= safeSizeOf(key, previous);
+			}
+		}
 
-        if (previous != null) {
-            entryRemoved(false, key, previous, value);
-        }
+		if (previous != null) {
+			entryRemoved(false, key, previous, value);
+		}
 
-        trimToSize(maxSize);
-        return previous;
-    }
+		trimToSize(maxSize);
+		return previous;
+	}
 
-    /**
-     * @param maxSize the maximum size of the cache before returning. May be -1
-     *     to evict even 0-sized elements.
-     */
-    private void trimToSize(int maxSize) {
-        while (true) {
-            K key;
-            V value;
-            synchronized (this) {
-                if (size < 0 || (map.isEmpty() && size != 0)) {
-                    throw new IllegalStateException(getClass().getName()
-                            + ".sizeOf() is reporting inconsistent results!");
-                }
+	/**
+	 * @param maxSize the maximum size of the cache before returning. May be -1
+	 *	 to evict even 0-sized elements.
+	 */
+	private void trimToSize(int maxSize) {
+		while (true) {
+			K key;
+			V value;
+			synchronized (this) {
+				if (size < 0 || (map.isEmpty() && size != 0)) {
+					throw new IllegalStateException(getClass().getName()
+							+ ".sizeOf() is reporting inconsistent results!");
+				}
 
-                if (size <= maxSize || map.isEmpty()) {
-                    break;
-                }
+				if (size <= maxSize || map.isEmpty()) {
+					break;
+				}
 
-                Map.Entry<K, V> toEvict = map.entrySet().iterator().next();
-                key = toEvict.getKey();
-                value = toEvict.getValue();
-                map.remove(key);
-                size -= safeSizeOf(key, value);
-                evictionCount++;
-            }
+				Map.Entry<K, V> toEvict = map.entrySet().iterator().next();
+				key = toEvict.getKey();
+				value = toEvict.getValue();
+				map.remove(key);
+				size -= safeSizeOf(key, value);
+				evictionCount++;
+			}
 
-            entryRemoved(true, key, value, null);
-        }
-    }
+			entryRemoved(true, key, value, null);
+		}
+	}
 
-    /**
-     * Removes the entry for {@code key} if it exists.
-     *
-     * @return the previous value mapped by {@code key}.
-     */
-    public final V remove(K key) {
-        if (key == null) {
-            throw new NullPointerException("key == null");
-        }
+	/**
+	 * Removes the entry for {@code key} if it exists.
+	 *
+	 * @return the previous value mapped by {@code key}.
+	 */
+	public final V remove(K key) {
+		if (key == null) {
+			throw new NullPointerException("key == null");
+		}
 
-        V previous;
-        synchronized (this) {
-            previous = map.remove(key);
-            if (previous != null) {
-                size -= safeSizeOf(key, previous);
-            }
-        }
+		V previous;
+		synchronized (this) {
+			previous = map.remove(key);
+			if (previous != null) {
+				size -= safeSizeOf(key, previous);
+			}
+		}
 
-        if (previous != null) {
-            entryRemoved(false, key, previous, null);
-        }
+		if (previous != null) {
+			entryRemoved(false, key, previous, null);
+		}
 
-        return previous;
-    }
+		return previous;
+	}
 
-    /**
-     * Called for entries that have been evicted or removed. This method is
-     * invoked when a value is evicted to make space, removed by a call to
-     * {@link #remove}, or replaced by a call to {@link #put}. The default
-     * implementation does nothing.
-     *
-     * <p>The method is called without synchronization: other threads may
-     * access the cache while this method is executing.
-     *
-     * @param evicted true if the entry is being removed to make space, false
-     *     if the removal was caused by a {@link #put} or {@link #remove}.
-     * @param newValue the new value for {@code key}, if it exists. If non-null,
-     *     this removal was caused by a {@link #put}. Otherwise it was caused by
-     *     an eviction or a {@link #remove}.
-     */
-    protected void entryRemoved(boolean evicted, K key, V oldValue, V newValue) {}
+	/**
+	 * Called for entries that have been evicted or removed. This method is
+	 * invoked when a value is evicted to make space, removed by a call to
+	 * {@link #remove}, or replaced by a call to {@link #put}. The default
+	 * implementation does nothing.
+	 *
+	 * <p>The method is called without synchronization: other threads may
+	 * access the cache while this method is executing.
+	 *
+	 * @param evicted true if the entry is being removed to make space, false
+	 *	 if the removal was caused by a {@link #put} or {@link #remove}.
+	 * @param newValue the new value for {@code key}, if it exists. If non-null,
+	 *	 this removal was caused by a {@link #put}. Otherwise it was caused by
+	 *	 an eviction or a {@link #remove}.
+	 */
+	protected void entryRemoved(boolean evicted, K key, V oldValue, V newValue) {}
 
-    /**
-     * Called after a cache miss to compute a value for the corresponding key.
-     * Returns the computed value or null if no value can be computed. The
-     * default implementation returns null.
-     *
-     * <p>The method is called without synchronization: other threads may
-     * access the cache while this method is executing.
-     *
-     * <p>If a value for {@code key} exists in the cache when this method
-     * returns, the created value will be released with {@link #entryRemoved}
-     * and discarded. This can occur when multiple threads request the same key
-     * at the same time (causing multiple values to be created), or when one
-     * thread calls {@link #put} while another is creating a value for the same
-     * key.
-     */
-    protected V create(K key) {
-        return null;
-    }
+	/**
+	 * Called after a cache miss to compute a value for the corresponding key.
+	 * Returns the computed value or null if no value can be computed. The
+	 * default implementation returns null.
+	 *
+	 * <p>The method is called without synchronization: other threads may
+	 * access the cache while this method is executing.
+	 *
+	 * <p>If a value for {@code key} exists in the cache when this method
+	 * returns, the created value will be released with {@link #entryRemoved}
+	 * and discarded. This can occur when multiple threads request the same key
+	 * at the same time (causing multiple values to be created), or when one
+	 * thread calls {@link #put} while another is creating a value for the same
+	 * key.
+	 */
+	protected V create(K key) {
+		return null;
+	}
 
-    private int safeSizeOf(K key, V value) {
-        int result = sizeOf(key, value);
-        if (result < 0) {
-            throw new IllegalStateException("Negative size: " + key + "=" + value);
-        }
-        return result;
-    }
+	private int safeSizeOf(K key, V value) {
+		int result = sizeOf(key, value);
+		if (result < 0) {
+			throw new IllegalStateException("Negative size: " + key + "=" + value);
+		}
+		return result;
+	}
 
-    /**
-     * Returns the size of the entry for {@code key} and {@code value} in
-     * user-defined units.  The default implementation returns 1 so that size
-     * is the number of entries and max size is the maximum number of entries.
-     *
-     * <p>An entry's size must not change while it is in the cache.
-     */
-    protected int sizeOf(K key, V value) {
-        return 1;
-    }
+	/**
+	 * Returns the size of the entry for {@code key} and {@code value} in
+	 * user-defined units.  The default implementation returns 1 so that size
+	 * is the number of entries and max size is the maximum number of entries.
+	 *
+	 * <p>An entry's size must not change while it is in the cache.
+	 */
+	protected int sizeOf(K key, V value) {
+		return 1;
+	}
 
-    /**
-     * Clear the cache, calling {@link #entryRemoved} on each removed entry.
-     */
-    public final void evictAll() {
-        trimToSize(-1); // -1 will evict 0-sized elements
-    }
+	/**
+	 * Clear the cache, calling {@link #entryRemoved} on each removed entry.
+	 */
+	public final void evictAll() {
+		trimToSize(-1); // -1 will evict 0-sized elements
+	}
 
-    /**
-     * For caches that do not override {@link #sizeOf}, this returns the number
-     * of entries in the cache. For all other caches, this returns the sum of
-     * the sizes of the entries in this cache.
-     */
-    public synchronized final int size() {
-        return size;
-    }
+	/**
+	 * For caches that do not override {@link #sizeOf}, this returns the number
+	 * of entries in the cache. For all other caches, this returns the sum of
+	 * the sizes of the entries in this cache.
+	 */
+	public synchronized final int size() {
+		return size;
+	}
 
-    /**
-     * For caches that do not override {@link #sizeOf}, this returns the maximum
-     * number of entries in the cache. For all other caches, this returns the
-     * maximum sum of the sizes of the entries in this cache.
-     */
-    public synchronized final int maxSize() {
-        return maxSize;
-    }
+	/**
+	 * For caches that do not override {@link #sizeOf}, this returns the maximum
+	 * number of entries in the cache. For all other caches, this returns the
+	 * maximum sum of the sizes of the entries in this cache.
+	 */
+	public synchronized final int maxSize() {
+		return maxSize;
+	}
 
-    /**
-     * Returns the number of times {@link #get} returned a value.
-     */
-    public synchronized final int hitCount() {
-        return hitCount;
-    }
+	/**
+	 * Returns the number of times {@link #get} returned a value.
+	 */
+	public synchronized final int hitCount() {
+		return hitCount;
+	}
 
-    /**
-     * Returns the number of times {@link #get} returned null or required a new
-     * value to be created.
-     */
-    public synchronized final int missCount() {
-        return missCount;
-    }
+	/**
+	 * Returns the number of times {@link #get} returned null or required a new
+	 * value to be created.
+	 */
+	public synchronized final int missCount() {
+		return missCount;
+	}
 
-    /**
-     * Returns the number of times {@link #create(Object)} returned a value.
-     */
-    public synchronized final int createCount() {
-        return createCount;
-    }
+	/**
+	 * Returns the number of times {@link #create(Object)} returned a value.
+	 */
+	public synchronized final int createCount() {
+		return createCount;
+	}
 
-    /**
-     * Returns the number of times {@link #put} was called.
-     */
-    public synchronized final int putCount() {
-        return putCount;
-    }
+	/**
+	 * Returns the number of times {@link #put} was called.
+	 */
+	public synchronized final int putCount() {
+		return putCount;
+	}
 
-    /**
-     * Returns the number of values that have been evicted.
-     */
-    public synchronized final int evictionCount() {
-        return evictionCount;
-    }
+	/**
+	 * Returns the number of values that have been evicted.
+	 */
+	public synchronized final int evictionCount() {
+		return evictionCount;
+	}
 
-    /**
-     * Returns a copy of the current contents of the cache, ordered from least
-     * recently accessed to most recently accessed.
-     */
-    public synchronized final Map<K, V> snapshot() {
-        return new LinkedHashMap<K, V>(map);
-    }
+	/**
+	 * Returns a copy of the current contents of the cache, ordered from least
+	 * recently accessed to most recently accessed.
+	 */
+	public synchronized final Map<K, V> snapshot() {
+		return new LinkedHashMap<K, V>(map);
+	}
 
-    @Override public synchronized final String toString() {
-        int accesses = hitCount + missCount;
-        int hitPercent = accesses != 0 ? (100 * hitCount / accesses) : 0;
-        return String.format("LruCache[maxSize=%d,hits=%d,misses=%d,hitRate=%d%%]",
-                maxSize, hitCount, missCount, hitPercent);
-    }
+	@Override public synchronized final String toString() {
+		int accesses = hitCount + missCount;
+		int hitPercent = accesses != 0 ? (100 * hitCount / accesses) : 0;
+		return String.format("LruCache[maxSize=%d,hits=%d,misses=%d,hitRate=%d%%]",
+				maxSize, hitCount, missCount, hitPercent);
+	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java
index cbadab36c..5a72e16ea 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Range.java
@@ -7,7 +7,7 @@ import java.io.IOException;
 public final class Range {
 	public int max;
 	public int current;
-	
+
 	public Range() { }
 	public Range(Range r) { set(r); }
 	public Range(ConstRange r) { set(r); }
@@ -15,16 +15,16 @@ public final class Range {
 		this.max = max;
 		this.current = current;
 	}
-	
+
 	public boolean equals(Range r) {
 		if (r == null) return false;
 		return max == r.max && current == r.current;
 	}
-    public boolean equals(ConstRange r) {
+	public boolean equals(ConstRange r) {
 		if (r == null) return false;
-        return max == r.max && current == r.current;
-    }
-	
+		return max == r.max && current == r.current;
+	}
+
 	public void set(Range r) {
 		this.max = r.max;
 		this.current = r.current;
@@ -69,11 +69,11 @@ public final class Range {
 		this.max += r.max;
 		this.current += r.current;
 	}
-	
+
 	public String toString() { return current + "/" + max; }
 	public String toMinMaxString() {
 		if (isMax()) return Integer.toString(max);
-		else return current + "-" + max; 
+		else return current + "-" + max;
 	}
 	public boolean isMax() { return current >= max;	}
 	public void setMax() { current = max; }
@@ -83,7 +83,7 @@ public final class Range {
 	public float averagef() {
 		return ((float) max + current) / 2f;
 	}
-	
+
 
 	// ====== PARCELABLE ===================================================================
 
@@ -94,7 +94,7 @@ public final class Range {
 		this.max = src.readInt();
 		this.current = src.readInt();
 	}
-	
+
 	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
 		dest.writeInt(max);
 		dest.writeInt(current);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Size.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Size.java
index 95d0f11f6..df2a66a87 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Size.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/Size.java
@@ -1,38 +1,38 @@
-package com.gpl.rpg.AndorsTrail.util;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-public final class Size {
-	public final int width;
-	public final int height;
-	public Size(int width, int height) {
-		this.width = width;
-		this.height = height;
-	}
-	
-	public String toString() {
-		return width + "x" + height;
-	}
-	
-	public boolean equals(final Size s) {
-		return width == s.width && height == s.height;
-	}
-	public boolean equals(final int w, final int h) {
-		return width == w && height == h;
-	}
-	
-	
-	// ====== PARCELABLE ===================================================================
-
-	public Size(DataInputStream src, int fileversion) throws IOException {
-		this.width = src.readInt();
-		this.height = src.readInt();
-	}
-	
-	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
-		dest.writeInt(width);
-		dest.writeInt(height);
-	}
-}
+package com.gpl.rpg.AndorsTrail.util;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public final class Size {
+	public final int width;
+	public final int height;
+	public Size(int width, int height) {
+		this.width = width;
+		this.height = height;
+	}
+
+	public String toString() {
+		return width + "x" + height;
+	}
+
+	public boolean equals(final Size s) {
+		return width == s.width && height == s.height;
+	}
+	public boolean equals(final int w, final int h) {
+		return width == w && height == h;
+	}
+
+
+	// ====== PARCELABLE ===================================================================
+
+	public Size(DataInputStream src, int fileversion) throws IOException {
+		this.width = src.readInt();
+		this.height = src.readInt();
+	}
+
+	public void writeToParcel(DataOutputStream dest, int flags) throws IOException {
+		dest.writeInt(width);
+		dest.writeInt(height);
+	}
+}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/TimedMessageTask.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/TimedMessageTask.java
index 5a2a4d1b2..507cd8d01 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/TimedMessageTask.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/TimedMessageTask.java
@@ -10,50 +10,50 @@ public final class TimedMessageTask extends Handler {
 	private long nextTickTime;
 	private boolean hasQueuedTick = false;
 	private boolean isAlive = false;
-	
+
 	public TimedMessageTask(Callback callback, long interval, boolean requireIntervalBeforeFirstTick) {
 		this.interval = interval;
 		this.requireIntervalBeforeFirstTick = requireIntervalBeforeFirstTick;
 		this.callback = callback;
 		this.nextTickTime = System.currentTimeMillis() + interval;
 	}
-	
+
 	@Override
-    public void handleMessage(Message msg) {
+	public void handleMessage(Message msg) {
 		if (!isAlive) return;
-	    if (!hasQueuedTick) return;
-    	hasQueuedTick = false;
-    	tick();
-    }
-	
+		if (!hasQueuedTick) return;
+		hasQueuedTick = false;
+		tick();
+	}
+
 	private void tick() {
 		nextTickTime = System.currentTimeMillis() + interval;
 		boolean continueTicking = callback.onTick(this);
 		if (continueTicking) queueAnotherTick();
-    }
+	}
 
-    private void sleep(long delayMillis) {
-    	this.removeMessages(0);
-        sendMessageDelayed(obtainMessage(0), delayMillis);
-    }
-    
-    private boolean hasElapsedIntervalTime() {
-    	return System.currentTimeMillis() >= nextTickTime;
-    }
-    
-    public void queueAnotherTick() {
-    	if (hasQueuedTick) return;
-    	hasQueuedTick = true;
-    	sleep(interval);
-    }
-    
-    private boolean shouldCauseTickOnStart() {
-    	if (requireIntervalBeforeFirstTick) return false;
-    	if (hasQueuedTick) return false;
+	private void sleep(long delayMillis) {
+		this.removeMessages(0);
+		sendMessageDelayed(obtainMessage(0), delayMillis);
+	}
+
+	private boolean hasElapsedIntervalTime() {
+		return System.currentTimeMillis() >= nextTickTime;
+	}
+
+	public void queueAnotherTick() {
+		if (hasQueuedTick) return;
+		hasQueuedTick = true;
+		sleep(interval);
+	}
+
+	private boolean shouldCauseTickOnStart() {
+		if (requireIntervalBeforeFirstTick) return false;
+		if (hasQueuedTick) return false;
 		if (!hasElapsedIntervalTime()) return false;
-    	return true;
-    }
-    
+		return true;
+	}
+
 	public void start() {
 		isAlive = true;
 		if (shouldCauseTickOnStart()) tick();
@@ -61,10 +61,10 @@ public final class TimedMessageTask extends Handler {
 	}
 
 	public void stop() {
-    	hasQueuedTick = false;
-    	isAlive = false;
+		hasQueuedTick = false;
+		isAlive = false;
 	}
-	
+
 	public interface Callback {
 		public boolean onTick(TimedMessageTask task);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java
index 1eab988bf..ddfbf9bb0 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/util/XmlResourceParserUtils.java
@@ -11,7 +11,7 @@ public final class XmlResourceParserUtils {
 	public static interface TagHandler {
 		void handleTag(XmlResourceParser xrp, String tagName) throws XmlPullParserException, IOException;
 	}
-	
+
 	public static void readCurrentTagUntilEnd(XmlResourceParser xrp, TagHandler handler) throws XmlPullParserException, IOException {
 		String outerTagName = xrp.getName();
 		String tagName;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
index ae3734b91..4f47c1824 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/AbilityModifierInfoView.java
@@ -23,35 +23,35 @@ public final class AbilityModifierInfoView extends LinearLayout {
 	private final TextView abilitymodifierinfo_change_critical_multiplier;
 	private final TextView abilitymodifierinfo_change_block_chance;
 	private final TextView abilitymodifierinfo_change_damage_resistance;
-	
+
 	public AbilityModifierInfoView(Context context, AttributeSet attr) {
 		super(context, attr);
-        setFocusable(false);
-        setOrientation(LinearLayout.VERTICAL);
-        inflate(context, R.layout.abilitymodifierview, this);
-        
-        abilitymodifierinfo_change_maxap = (TextView) findViewById(R.id.abilitymodifierinfo_change_maxap);
-        abilitymodifierinfo_change_maxhp = (TextView) findViewById(R.id.abilitymodifierinfo_change_maxhp);
-        abilitymodifierinfo_change_movecost = (TextView) findViewById(R.id.abilitymodifierinfo_change_movecost);
-        abilitymodifierinfo_change_use_cost = (TextView) findViewById(R.id.abilitymodifierinfo_change_use_cost);
-        abilitymodifierinfo_change_reequip_cost = (TextView) findViewById(R.id.abilitymodifierinfo_change_reequip_cost);
-        abilitymodifierinfo_change_attack_cost = (TextView) findViewById(R.id.abilitymodifierinfo_change_attack_cost);
-        abilitymodifierinfo_change_attack_chance = (TextView) findViewById(R.id.abilitymodifierinfo_change_attack_chance);
-        abilitymodifierinfo_change_attack_damage = (TextView) findViewById(R.id.abilitymodifierinfo_change_attack_damage);
-        abilitymodifierinfo_change_critical_skill = (TextView) findViewById(R.id.abilitymodifierinfo_change_critical_skill);
-        abilitymodifierinfo_change_critical_multiplier = (TextView) findViewById(R.id.abilitymodifierinfo_change_critical_multiplier);
-        abilitymodifierinfo_change_block_chance = (TextView) findViewById(R.id.abilitymodifierinfo_change_block_chance);
-        abilitymodifierinfo_change_damage_resistance = (TextView) findViewById(R.id.abilitymodifierinfo_change_damage_resistance);
-    }
+		setFocusable(false);
+		setOrientation(LinearLayout.VERTICAL);
+		inflate(context, R.layout.abilitymodifierview, this);
+
+		abilitymodifierinfo_change_maxap = (TextView) findViewById(R.id.abilitymodifierinfo_change_maxap);
+		abilitymodifierinfo_change_maxhp = (TextView) findViewById(R.id.abilitymodifierinfo_change_maxhp);
+		abilitymodifierinfo_change_movecost = (TextView) findViewById(R.id.abilitymodifierinfo_change_movecost);
+		abilitymodifierinfo_change_use_cost = (TextView) findViewById(R.id.abilitymodifierinfo_change_use_cost);
+		abilitymodifierinfo_change_reequip_cost = (TextView) findViewById(R.id.abilitymodifierinfo_change_reequip_cost);
+		abilitymodifierinfo_change_attack_cost = (TextView) findViewById(R.id.abilitymodifierinfo_change_attack_cost);
+		abilitymodifierinfo_change_attack_chance = (TextView) findViewById(R.id.abilitymodifierinfo_change_attack_chance);
+		abilitymodifierinfo_change_attack_damage = (TextView) findViewById(R.id.abilitymodifierinfo_change_attack_damage);
+		abilitymodifierinfo_change_critical_skill = (TextView) findViewById(R.id.abilitymodifierinfo_change_critical_skill);
+		abilitymodifierinfo_change_critical_multiplier = (TextView) findViewById(R.id.abilitymodifierinfo_change_critical_multiplier);
+		abilitymodifierinfo_change_block_chance = (TextView) findViewById(R.id.abilitymodifierinfo_change_block_chance);
+		abilitymodifierinfo_change_damage_resistance = (TextView) findViewById(R.id.abilitymodifierinfo_change_damage_resistance);
+	}
 
 	public void update(AbilityModifierTraits traits, boolean isWeapon) {
 		for(int i = 0; i < getChildCount(); ++i) {
 			getChildAt(i).setVisibility(View.GONE);
 		}
 		if (traits == null) return;
-		
+
 		final Resources res = getResources();
-		
+
 		displayIfNonZero(traits.increaseMaxHP, abilitymodifierinfo_change_maxhp, R.string.iteminfo_effect_increase_max_hp, R.string.iteminfo_effect_decrease_max_hp);
 		displayIfNonZero(traits.increaseMaxAP, abilitymodifierinfo_change_maxap, R.string.iteminfo_effect_increase_max_ap, R.string.iteminfo_effect_decrease_max_ap);
 		displayIfNonZero(traits.increaseMoveCost, abilitymodifierinfo_change_movecost, R.string.iteminfo_effect_increase_movecost, R.string.iteminfo_effect_decrease_movecost);
@@ -60,12 +60,12 @@ public final class AbilityModifierInfoView extends LinearLayout {
 		displayIfNonZero(traits.increaseCriticalSkill, abilitymodifierinfo_change_critical_skill, R.string.iteminfo_effect_increase_critical_skill, R.string.iteminfo_effect_decrease_critical_skill);
 		displayIfNonZero(traits.increaseBlockChance, abilitymodifierinfo_change_block_chance, R.string.iteminfo_effect_increase_block_chance, R.string.iteminfo_effect_decrease_block_chance);
 		displayIfNonZero(traits.increaseDamageResistance, abilitymodifierinfo_change_damage_resistance, R.string.iteminfo_effect_increase_damage_resistance, R.string.iteminfo_effect_decrease_damage_resistance);
-		
+
 		if (isWeapon) {
 			abilitymodifierinfo_change_attack_cost.setText(res.getString(R.string.iteminfo_effect_weapon_attack_cost, traits.increaseAttackCost));
 			abilitymodifierinfo_change_attack_cost.setVisibility(View.VISIBLE);
 			displayIfNonZero(traits.increaseAttackChance, abilitymodifierinfo_change_attack_chance, R.string.iteminfo_effect_weapon_attack_chance, R.string.iteminfo_effect_decrease_attack_chance);
-			
+
 			if (traits.setCriticalMultiplier != 0) {
 				abilitymodifierinfo_change_critical_multiplier.setText(res.getString(R.string.iteminfo_effect_critical_multiplier, Math.abs(traits.setCriticalMultiplier)));
 				abilitymodifierinfo_change_critical_multiplier.setVisibility(View.VISIBLE);
@@ -74,7 +74,7 @@ public final class AbilityModifierInfoView extends LinearLayout {
 			displayIfNonZero(traits.increaseAttackCost, abilitymodifierinfo_change_attack_cost, R.string.iteminfo_effect_increase_attack_cost, R.string.iteminfo_effect_decrease_attack_cost);
 			displayIfNonZero(traits.increaseAttackChance, abilitymodifierinfo_change_attack_chance, R.string.iteminfo_effect_increase_attack_chance, R.string.iteminfo_effect_decrease_attack_chance);
 		}
-		
+
 		if (traits.increaseMinDamage != 0 || traits.increaseMaxDamage != 0) {
 			if (traits.increaseMinDamage == traits.increaseMaxDamage) {
 				int label = R.string.iteminfo_effect_increase_attack_damage;
@@ -93,7 +93,7 @@ public final class AbilityModifierInfoView extends LinearLayout {
 
 	private void displayIfNonZero(int statChange, TextView textView, int stringresource_increase, int stringresource_decrease) {
 		if (statChange == 0) return;
-		
+
 		final int label = statChange > 0 ? stringresource_increase : stringresource_decrease;
 		textView.setText(getResources().getString(label, Math.abs(statChange)));
 		textView.setVisibility(View.VISIBLE);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
index 4bd3beae6..4d6216492 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionEffectList.java
@@ -18,32 +18,32 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 public final class ActorConditionEffectList extends LinearLayout {
-	
+
 	public ActorConditionEffectList(Context context, AttributeSet attr) {
 		super(context, attr);
-        setFocusable(false);
-        setOrientation(LinearLayout.VERTICAL);
-    }
+		setFocusable(false);
+		setOrientation(LinearLayout.VERTICAL);
+	}
 
 	public void update(Collection<ActorConditionEffect> effects) {
 		removeAllViews();
 		if (effects == null) return;
-		
+
 		final Context context = getContext();
 		final Resources res = getResources();
 		LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-		
+
 		for (ActorConditionEffect e : effects) {
 			String msg;
 			final ActorConditionType conditionType = e.conditionType;
 			if (e.isRemovalEffect()) {
 				msg = res.getString(R.string.actorcondition_info_removes_all, conditionType.name);
 			} else {
-				msg = describeEffect(res, e); 
+				msg = describeEffect(res, e);
 			}
 			TextView tv = new TextView(context);
 			tv.setLayoutParams(layoutParams);
-			
+
 			SpannableString content = new SpannableString(msg);
 			content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
 			tv.setText(content);
@@ -57,18 +57,18 @@ public final class ActorConditionEffectList extends LinearLayout {
 		}
 	}
 
-    private static String describeEffect(Resources res, ActorConditionEffect effect) {
+	private static String describeEffect(Resources res, ActorConditionEffect effect) {
 		String msg = describeEffect(res, effect.conditionType, effect.magnitude, effect.duration);
 		if (effect.chance.isMax()) return msg;
-		
+
 		return res.getString(R.string.iteminfo_effect_chance_of, effect.chance.toPercentString(), msg);
 	}
-	
+
 	public static String describeEffect(Resources res, ActorConditionType conditionType, int magnitude, int duration) {
 		StringBuilder sb = new StringBuilder(conditionType.name);
 		if (magnitude > 1) {
 			sb.append(" x");
-			sb.append(magnitude); 
+			sb.append(magnitude);
 		}
 		if (ActorCondition.isTemporaryEffect(duration)) {
 			sb.append(' ');
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
index 5f3fb1c38..cff8ac67d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ActorConditionList.java
@@ -18,25 +18,25 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 public final class ActorConditionList extends LinearLayout {
-	
+
 	private final WorldContext world;
 
 	public ActorConditionList(Context context, AttributeSet attr) {
 		super(context, attr);
-        setFocusable(false);
-        setOrientation(LinearLayout.VERTICAL);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
-        this.world = app.getWorld();
-    }
+		setFocusable(false);
+		setOrientation(LinearLayout.VERTICAL);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
+		this.world = app.getWorld();
+	}
 
 	public void update(Iterable<ActorCondition> conditions) {
 		removeAllViews();
 		if (conditions == null) return;
-		
+
 		final Context context = getContext();
 		final Resources res = getResources();
 		LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-		
+
 		for (ActorCondition c : conditions) {
 			TextView v = (TextView) View.inflate(context, R.layout.inventoryitemview, null);
 			world.tileManager.setImageViewTile(res, v, c.conditionType);
@@ -53,8 +53,8 @@ public final class ActorConditionList extends LinearLayout {
 			this.addView(v, layoutParams);
 		}
 	}
-    
-    private static String describeEffect(Resources res, ActorCondition c) {
-    	return ActorConditionEffectList.describeEffect(res, c.conditionType, c.magnitude, c.duration);
+
+	private static String describeEffect(Resources res, ActorCondition c) {
+		return ActorConditionEffectList.describeEffect(res, c.conditionType, c.magnitude, c.duration);
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
index 9e2917b55..7272c0e20 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CombatView.java
@@ -36,7 +36,7 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 	private final View monsterBar;
 	private final View actionBar;
 	private final TextView monsterActionText;
-	
+
 	private final WorldContext world;
 	private final ControllerContext controllers;
 	private final Resources res;
@@ -46,74 +46,74 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 	private final Animation hideAnimation;
 
 	private Monster currentMonster;
-	
+
 	public CombatView(final Context context, AttributeSet attr) {
 		super(context, attr);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
-        this.world = app.getWorld();
-        this.player = world.model.player;
-        this.controllers = app.getControllerContext();
-        this.preferences = app.getPreferences();
-        this.res = getResources();
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
+		this.world = app.getWorld();
+		this.player = world.model.player;
+		this.controllers = app.getControllerContext();
+		this.preferences = app.getPreferences();
+		this.res = getResources();
 
-        setFocusable(false);
-        inflate(context, R.layout.combatview, this);
-        this.setBackgroundResource(R.drawable.ui_gradientshape_translucent);
-        
-        final CombatController c = controllers.combatController;
-        attackMoveButton = (Button) findViewById(R.id.combatview_moveattack);
-        attackMoveButton.setOnClickListener(new OnClickListener() {
+		setFocusable(false);
+		inflate(context, R.layout.combatview, this);
+		this.setBackgroundResource(R.drawable.ui_gradientshape_translucent);
+
+		final CombatController c = controllers.combatController;
+		attackMoveButton = (Button) findViewById(R.id.combatview_moveattack);
+		attackMoveButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				c.executeMoveAttack(0, 0);
 			}
 		});
-        
-        Button endTurnButton = (Button) findViewById(R.id.combatview_endturn);
-        endTurnButton.setOnClickListener(new OnClickListener() {
+
+		Button endTurnButton = (Button) findViewById(R.id.combatview_endturn);
+		endTurnButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				c.beginMonsterTurn(false);
 			}
 		});
-        Button fleeButton = (Button) findViewById(R.id.combatview_flee);
-        fleeButton.setOnClickListener(new OnClickListener() {
+		Button fleeButton = (Button) findViewById(R.id.combatview_flee);
+		fleeButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				c.startFlee();
 			}
 		});
-        
-        statusTextView = (TextView) findViewById(R.id.combatview_status);
-        
-        monsterInfo = (ImageButton) findViewById(R.id.combatview_monsterinfo);
-        monsterInfo.setOnClickListener(new OnClickListener() {
+
+		statusTextView = (TextView) findViewById(R.id.combatview_status);
+
+		monsterInfo = (ImageButton) findViewById(R.id.combatview_monsterinfo);
+		monsterInfo.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				Dialogs.showMonsterInfo(context, currentMonster);
 			}
 		});
-        
-        monsterHealth = (RangeBar) findViewById(R.id.combatview_monsterhealth);
-        monsterHealth.init(R.drawable.ui_progress_health, R.string.combat_monsterhealth);
-        monsterBar = findViewById(R.id.combatview_monsterbar);
-        actionBar = findViewById(R.id.combatview_actionbar);
-        monsterActionText = (TextView) findViewById(R.id.combatview_monsterismoving);
-        
-        monsterBar.setBackgroundColor(res.getColor(color.transparent));
-        actionBar.setBackgroundColor(res.getColor(color.transparent));
-        
-        displayAnimation = AnimationUtils.loadAnimation(context, R.anim.showcombatbar);
-        hideAnimation = AnimationUtils.loadAnimation(context, R.anim.hidecombatbar);
-        hideAnimation.setAnimationListener(new AnimationListener() {
+
+		monsterHealth = (RangeBar) findViewById(R.id.combatview_monsterhealth);
+		monsterHealth.init(R.drawable.ui_progress_health, R.string.combat_monsterhealth);
+		monsterBar = findViewById(R.id.combatview_monsterbar);
+		actionBar = findViewById(R.id.combatview_actionbar);
+		monsterActionText = (TextView) findViewById(R.id.combatview_monsterismoving);
+
+		monsterBar.setBackgroundColor(res.getColor(color.transparent));
+		actionBar.setBackgroundColor(res.getColor(color.transparent));
+
+		displayAnimation = AnimationUtils.loadAnimation(context, R.anim.showcombatbar);
+		hideAnimation = AnimationUtils.loadAnimation(context, R.anim.hidecombatbar);
+		hideAnimation.setAnimationListener(new AnimationListener() {
 			@Override public void onAnimationStart(Animation animation) {}
 			@Override public void onAnimationRepeat(Animation animation) {}
 			@Override public void onAnimationEnd(Animation arg0) {
 				CombatView.this.setVisibility(View.GONE);
 			}
 		});
-    }
-	
+	}
+
 	private void updateTurnInfo(Monster currentActiveMonster) {
 		if (currentActiveMonster != null) {
 			actionBar.setVisibility(View.INVISIBLE);
@@ -126,14 +126,14 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 	}
 
 	private void updateMonsterHealth(Monster m) {
-	    monsterHealth.update(m.getMaxHP(), m.getCurrentHP());
+		monsterHealth.update(m.getMaxHP(), m.getCurrentHP());
 	}
 	private void updatePlayerAP() {
 		statusTextView.setText(res.getString(R.string.combat_status_ap, player.getCurrentAP()));
 	}
 	private void updateSelectedMonster(Monster selectedMonster) {
 		if (currentMonster != null && currentMonster == selectedMonster) return;
-		
+
 		attackMoveButton.setEnabled(true);
 		monsterBar.setVisibility(View.INVISIBLE);
 		currentMonster = null;
@@ -141,7 +141,7 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 			monsterBar.setVisibility(View.VISIBLE);
 			world.tileManager.setImageViewTile(monsterInfo, selectedMonster);
 			updateMonsterHealth(selectedMonster);
-	        currentMonster = selectedMonster;
+			currentMonster = selectedMonster;
 		}
 		updateAttackMoveButtonText(selectedMonster != null);
 	}
@@ -165,10 +165,10 @@ public final class CombatView extends RelativeLayout implements CombatSelectionL
 	private void show() {
 		updateStatus();
 		setVisibility(View.VISIBLE);
-    	bringToFront();
-    	if (preferences.enableUiAnimations) {
-    		startAnimation(displayAnimation);
-    	}
+		bringToFront();
+		if (preferences.enableUiAnimations) {
+			startAnimation(displayAnimation);
+		}
 	}
 
 	private void hide() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
index a80090468..23083b7de 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/DisplayActiveActorConditionIcons.java
@@ -24,7 +24,7 @@ import com.gpl.rpg.AndorsTrail.model.listeners.ActorConditionListener;
 import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class DisplayActiveActorConditionIcons implements ActorConditionListener {
-	
+
 	private final AndorsTrailPreferences preferences;
 	private final TileManager tileManager;
 	private final ControllerContext controllers;
@@ -32,11 +32,11 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 	private final RelativeLayout activeConditions;
 	private final ArrayList<ActiveConditionIcon> currentConditionIcons = new ArrayList<ActiveConditionIcon>();
 	private final WeakReference<Context> androidContext;
-	
+
 	public DisplayActiveActorConditionIcons(
 			final ControllerContext controllers,
-			final WorldContext world, 
-			Context androidContext, 
+			final WorldContext world,
+			Context androidContext,
 			RelativeLayout activeConditions) {
 		this.controllers = controllers;
 		this.world = world;
@@ -103,7 +103,7 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 		private final Animation onNewIconAnimation;
 		private final Animation onRemovedIconAnimation;
 		private final Animation onAppliedEffectAnimation;
-		
+
 		public ActiveConditionIcon(Context context, int id) {
 			this.id = id;
 			this.image = new ImageView(context);
@@ -113,13 +113,13 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 			this.onRemovedIconAnimation = AnimationUtils.loadAnimation(context, R.anim.scaledown);
 			this.onAppliedEffectAnimation = AnimationUtils.loadAnimation(context, R.anim.scalebeat);
 			this.onRemovedIconAnimation.setAnimationListener(this);
-			
+
 			final Resources res = context.getResources();
-			
+
 			text.setTextColor(res.getColor(android.R.color.white));
 			text.setShadowLayer(1, 1, 1, res.getColor(android.R.color.black));
 		}
-		
+
 		private void setActiveCondition(ActorCondition condition) {
 			this.condition = condition;
 			tileManager.setImageViewTile(image, condition.conditionType);
@@ -136,7 +136,7 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 				text.setVisibility(View.GONE);
 			}
 		}
-		
+
 		public void hide(boolean useAnimation) {
 			if (useAnimation) {
 				if (preferences.enableUiAnimations) {
@@ -155,28 +155,28 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 			image.startAnimation(onNewIconAnimation);
 			if (text.getVisibility() == View.VISIBLE) text.startAnimation(onNewIconAnimation);
 		}
-		
+
 		public void pulseAnimate() {
 			if (!preferences.enableUiAnimations) return;
 			image.startAnimation(onAppliedEffectAnimation);
 		}
-		
+
 		public boolean isVisible() {
 			return condition != null;
 		}
-		
+
 		@Override
-		public void onAnimationEnd(Animation animation) { 
+		public void onAnimationEnd(Animation animation) {
 			if (animation == this.onRemovedIconAnimation) {
 				hide(false);
 				rearrangeIconsLeftOf(this);
 			}
 		}
-		
+
 		@Override public void onAnimationRepeat(Animation animation) { }
 		@Override public void onAnimationStart(Animation animation) { }
 	}
-	
+
 	private void rearrangeIconsLeftOf(ActiveConditionIcon icon) {
 		int i = currentConditionIcons.indexOf(icon);
 		currentConditionIcons.remove(i);
@@ -185,7 +185,7 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 			currentConditionIcons.get(i).image.setLayoutParams(getLayoutParamsForIconIndex(i));
 		}
 	}
-	
+
 	private ActiveConditionIcon getIconFor(ActorCondition condition) {
 		for (ActiveConditionIcon icon : currentConditionIcons) {
 			if (icon.condition == condition) return icon;
@@ -198,7 +198,7 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 		}
 		return addNewActiveConditionIcon();
 	}
-	
+
 	private RelativeLayout.LayoutParams getLayoutParamsForIconIndex(int index) {
 		RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
 		layout.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
@@ -212,18 +212,18 @@ public final class DisplayActiveActorConditionIcons implements ActorConditionLis
 
 	private ActiveConditionIcon addNewActiveConditionIcon() {
 		int index = currentConditionIcons.size();
-				
+
 		ActiveConditionIcon icon = new ActiveConditionIcon(androidContext.get(), index+1);
-		
+
 		activeConditions.addView(icon.image, getLayoutParamsForIconIndex(index));
-		
+
 		RelativeLayout.LayoutParams layout = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
 		layout.addRule(RelativeLayout.ALIGN_RIGHT, icon.id);
 		layout.addRule(RelativeLayout.ALIGN_BOTTOM, icon.id);
 		activeConditions.addView(icon.text, layout);
-		
+
 		currentConditionIcons.add(icon);
-		
+
 		return icon;
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
index f7ad22003..e7ec92252 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemContainerAdapter.java
@@ -19,7 +19,7 @@ public final class ItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 	private final TileManager tileManager;
 	private final TileCollection tileCollection;
 	private final Player player;
-	
+
 	public ItemContainerAdapter(Context context, TileManager tileManager, ItemContainer items, Player player) {
 		this(context, tileManager, items, player, tileManager.loadTilesFor(items, context.getResources()));
 	}
@@ -33,7 +33,7 @@ public final class ItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 	@Override
 	public View getView(final int position, View convertView, ViewGroup parent) {
 		final ItemEntry item = getItem(position);
-		
+
 		View result = convertView;
 		if (result == null) {
 			result = View.inflate(getContext(), R.layout.inventoryitemview, null);
@@ -44,7 +44,7 @@ public final class ItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 		tv.setText(ItemController.describeItemForListView(item, player));
 		return result;
 	}
-	
+
 	@Override
 	public long getItemId(int position) {
 		return getItem(position).itemType.id.hashCode();
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
index 28319481c..fc67c348a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView.java
@@ -23,39 +23,39 @@ public final class ItemEffectsView extends LinearLayout {
 	private final TextView itemeffect_onuse_title;
 	private final TextView itemeffect_onhit_title;
 	private final TextView itemeffect_onkill_title;
-	
+
 	public ItemEffectsView(Context context, AttributeSet attr) {
 		super(context, attr);
-        setFocusable(false);
-        setOrientation(LinearLayout.VERTICAL);
-        inflate(context, R.layout.itemeffectview, this);
-        
-        itemeffect_onequip_title = (TextView) findViewById(R.id.itemeffect_onequip_title);
-        itemeffect_onequip_abilitymodifierinfo = (AbilityModifierInfoView) findViewById(R.id.itemeffect_onequip_abilitymodifierinfo);
-        itemeffect_onequip_conditions = (ActorConditionEffectList) findViewById(R.id.itemeffect_onequip_conditions);
-        
-        itemeffect_onuse = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onuse);
-        itemeffect_onhit = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onhit);
-        itemeffect_onkill = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onkill);
-        itemeffect_onuse_title = (TextView) findViewById(R.id.itemeffect_onuse_title);
-        itemeffect_onhit_title = (TextView) findViewById(R.id.itemeffect_onhit_title);
-        itemeffect_onkill_title = (TextView) findViewById(R.id.itemeffect_onkill_title);
-    }
+		setFocusable(false);
+		setOrientation(LinearLayout.VERTICAL);
+		inflate(context, R.layout.itemeffectview, this);
+
+		itemeffect_onequip_title = (TextView) findViewById(R.id.itemeffect_onequip_title);
+		itemeffect_onequip_abilitymodifierinfo = (AbilityModifierInfoView) findViewById(R.id.itemeffect_onequip_abilitymodifierinfo);
+		itemeffect_onequip_conditions = (ActorConditionEffectList) findViewById(R.id.itemeffect_onequip_conditions);
+
+		itemeffect_onuse = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onuse);
+		itemeffect_onhit = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onhit);
+		itemeffect_onkill = (ItemEffectsView_OnUse) findViewById(R.id.itemeffect_onkill);
+		itemeffect_onuse_title = (TextView) findViewById(R.id.itemeffect_onuse_title);
+		itemeffect_onhit_title = (TextView) findViewById(R.id.itemeffect_onhit_title);
+		itemeffect_onkill_title = (TextView) findViewById(R.id.itemeffect_onkill_title);
+	}
 
 	public void update(
-			ItemTraits_OnEquip effects_equip, 
+			ItemTraits_OnEquip effects_equip,
 			Collection<ItemTraits_OnUse> effects_use,
 			Collection<ItemTraits_OnUse> effects_hit,
 			Collection<ItemTraits_OnUse> effects_kill,
 			boolean isWeapon
 			) {
-		
+
 		itemeffect_onequip_title.setVisibility(View.GONE);
 		itemeffect_onequip_abilitymodifierinfo.setVisibility(View.GONE);
 		itemeffect_onequip_conditions.update(null);
 		if (effects_equip != null) {
 			itemeffect_onequip_title.setVisibility(View.VISIBLE);
-			
+
 			if (effects_equip.stats != null) {
 				itemeffect_onequip_abilitymodifierinfo.update(effects_equip.stats, isWeapon);
 				itemeffect_onequip_abilitymodifierinfo.setVisibility(View.VISIBLE);
@@ -72,14 +72,14 @@ public final class ItemEffectsView extends LinearLayout {
 		} else {
 			itemeffect_onuse_title.setVisibility(View.GONE);
 		}
-		
+
 		itemeffect_onhit.update(effects_hit);
 		if (effects_hit != null) {
 			itemeffect_onhit_title.setVisibility(View.VISIBLE);
 		} else {
 			itemeffect_onhit_title.setVisibility(View.GONE);
 		}
-		
+
 		itemeffect_onkill.update(effects_kill);
 		if (effects_kill != null) {
 			itemeffect_onkill_title.setVisibility(View.VISIBLE);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
index e368220d5..88f555abd 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ItemEffectsView_OnUse.java
@@ -22,24 +22,24 @@ public final class ItemEffectsView_OnUse extends LinearLayout {
 	private final ActorConditionEffectList itemeffect_onuse_conditions_target;
 	private final TextView itemeffect_onuse_conditions_source_title;
 	private final TextView itemeffect_onuse_conditions_target_title;
-	
+
 	public ItemEffectsView_OnUse(Context context, AttributeSet attr) {
 		super(context, attr);
-        setFocusable(false);
-        setOrientation(LinearLayout.VERTICAL);
-        inflate(context, R.layout.itemeffectview_onuse, this);
-        
-        itemeffect_onuse_list = (LinearLayout) findViewById(R.id.itemeffect_onuse_list);
-        itemeffect_onuse_conditions_source_title = (TextView) findViewById(R.id.itemeffect_onuse_conditions_source_title);
-        itemeffect_onuse_conditions_target_title = (TextView) findViewById(R.id.itemeffect_onuse_conditions_target_title);
-        itemeffect_onuse_conditions_source = (ActorConditionEffectList) findViewById(R.id.itemeffect_onuse_conditions_source);
-        itemeffect_onuse_conditions_target = (ActorConditionEffectList) findViewById(R.id.itemeffect_onuse_conditions_target);
-    }
+		setFocusable(false);
+		setOrientation(LinearLayout.VERTICAL);
+		inflate(context, R.layout.itemeffectview_onuse, this);
+
+		itemeffect_onuse_list = (LinearLayout) findViewById(R.id.itemeffect_onuse_list);
+		itemeffect_onuse_conditions_source_title = (TextView) findViewById(R.id.itemeffect_onuse_conditions_source_title);
+		itemeffect_onuse_conditions_target_title = (TextView) findViewById(R.id.itemeffect_onuse_conditions_target_title);
+		itemeffect_onuse_conditions_source = (ActorConditionEffectList) findViewById(R.id.itemeffect_onuse_conditions_source);
+		itemeffect_onuse_conditions_target = (ActorConditionEffectList) findViewById(R.id.itemeffect_onuse_conditions_target);
+	}
 
 	public void update(Collection<ItemTraits_OnUse> effects) {
 		ArrayList<ActorConditionEffect> sourceEffects = new ArrayList<ActorConditionEffect>();
 		ArrayList<ActorConditionEffect> targetEffects = new ArrayList<ActorConditionEffect>();
-		
+
 		itemeffect_onuse_list.removeAllViews();
 		if (effects != null) {
 			final Context context = getContext();
@@ -47,7 +47,7 @@ public final class ItemEffectsView_OnUse extends LinearLayout {
 			for (ItemTraits_OnUse t : effects) {
 				if (t.addedConditions_source != null) sourceEffects.addAll(Arrays.asList(t.addedConditions_source));
 				if (t.addedConditions_target != null) targetEffects.addAll(Arrays.asList(t.addedConditions_target));
-				
+
 				describeStatsModifierTraits(t.changedStats, context, res, itemeffect_onuse_list);
 			}
 		}
@@ -64,10 +64,10 @@ public final class ItemEffectsView_OnUse extends LinearLayout {
 			itemeffect_onuse_conditions_target_title.setVisibility(View.VISIBLE);
 		}
 	}
-	
+
 	public static void describeStatsModifierTraits(StatsModifierTraits traits, Context context, Resources res, LinearLayout listView) {
 		LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
-		
+
 		if (traits.currentAPBoost != null) {
 			final int label = traits.currentAPBoost.max > 0 ? R.string.iteminfo_effect_increase_current_ap : R.string.iteminfo_effect_decrease_current_ap;
 			final TextView tv = new TextView(context);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
index 7e68502ee..254c7b081 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
@@ -32,36 +32,36 @@ import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 
-public final class MainView extends SurfaceView 
-	implements SurfaceHolder.Callback, 
-		PlayerMovementListener, 
-		CombatSelectionListener, 
-		MonsterSpawnListener, 
+public final class MainView extends SurfaceView
+	implements SurfaceHolder.Callback,
+		PlayerMovementListener,
+		CombatSelectionListener,
+		MonsterSpawnListener,
 		MonsterMovementListener,
 		MapLayoutListener,
 		VisualEffectFrameListener,
 		GameRoundListener {
 
 	private final int tileSize;
-    private float scale;
-    private int scaledTileSize;
+	private float scale;
+	private int scaledTileSize;
 
-    private Size screenSizeTileCount = null;
-    private final Coord screenOffset = new Coord(); // pixel offset where the image begins
-    private final Coord mapTopLeft = new Coord(); // Map coords of visible map
-    private CoordRect mapViewArea; // Area in mapcoordinates containing the visible map. topleft == this.topleft
-    
-    private final ModelContainer model;
-    private final WorldContext world;
+	private Size screenSizeTileCount = null;
+	private final Coord screenOffset = new Coord(); // pixel offset where the image begins
+	private final Coord mapTopLeft = new Coord(); // Map coords of visible map
+	private CoordRect mapViewArea; // Area in mapcoordinates containing the visible map. topleft == this.topleft
+
+	private final ModelContainer model;
+	private final WorldContext world;
 	private final ControllerContext controllers;
 	private final InputController inputController;
 	private final AndorsTrailPreferences preferences;
-	
-    private final SurfaceHolder holder;
-    private final Paint mPaint = new Paint();
+
+	private final SurfaceHolder holder;
+	private final Paint mPaint = new Paint();
 	private final CoordRect p1x1 = new CoordRect(new Coord(), new Size(1,1));
 	private boolean hasSurface = false;
-	
+
 	private PredefinedMap currentMap;
 	private LayeredTileMap currentTileMap;
 	private TileCollection tiles;
@@ -72,39 +72,39 @@ public final class MainView extends SurfaceView
 	public MainView(Context context, AttributeSet attr) {
 		super(context, attr);
 		this.holder = getHolder();
-		
-		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
-        this.controllers = app.getControllerContext();
-        this.world = app.getWorld();
-    	this.model = world.model;
-    	this.tileSize = world.tileManager.tileSize;
-    	this.inputController = controllers.inputController;
-    	this.preferences = app.getPreferences();
 
-    	holder.addCallback(this);
-    	
-        setFocusable(true);
-        requestFocus();
-        setOnClickListener(this.inputController);
-        setOnLongClickListener(this.inputController);
-    }
-    
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent msg) {
-    	if (!canAcceptInput()) return true;
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
+		this.controllers = app.getControllerContext();
+		this.world = app.getWorld();
+		this.model = world.model;
+		this.tileSize = world.tileManager.tileSize;
+		this.inputController = controllers.inputController;
+		this.preferences = app.getPreferences();
+
+		holder.addCallback(this);
+
+		setFocusable(true);
+		requestFocus();
+		setOnClickListener(this.inputController);
+		setOnLongClickListener(this.inputController);
+	}
+
+	@Override
+	public boolean onKeyDown(int keyCode, KeyEvent msg) {
+		if (!canAcceptInput()) return true;
 
 		if (inputController.onKeyboardAction(keyCode)) return true;
 		else return super.onKeyDown(keyCode, msg);
-    }
-    
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent msg) {
+	}
+
+	@Override
+	public boolean onKeyUp(int keyCode, KeyEvent msg) {
 		if (!canAcceptInput()) return true;
-		
+
 		inputController.onKeyboardCancel();
-		
-    	return super.onKeyUp(keyCode, msg);
-    }
+
+		return super.onKeyUp(keyCode, msg);
+	}
 
 	@Override
 	public void surfaceChanged(SurfaceHolder sh, int format, int w, int h) {
@@ -118,12 +118,12 @@ public final class MainView extends SurfaceView
 				(int) Math.floor(w / scaledTileSize)
 				,(int) Math.floor(h / scaledTileSize)
 			);
-		
-    	if (model.currentMap != null) {
-    		onPlayerEnteredNewMap(model.currentMap, model.player.position);
-    	} else {
-    		redrawAll(REDRAW_ALL_SURFACE_CHANGED);
-    	}
+
+		if (model.currentMap != null) {
+			onPlayerEnteredNewMap(model.currentMap, model.player.position);
+		} else {
+			redrawAll(REDRAW_ALL_SURFACE_CHANGED);
+		}
 	}
 
 	@Override
@@ -138,8 +138,8 @@ public final class MainView extends SurfaceView
 
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
-        if (!canAcceptInput()) return true;
-		
+		if (!canAcceptInput()) return true;
+
 		switch (event.getAction()) {
 		case MotionEvent.ACTION_DOWN:
 		case MotionEvent.ACTION_MOVE:
@@ -155,7 +155,7 @@ public final class MainView extends SurfaceView
 		}
 		return super.onTouchEvent(event);
 	}
-    
+
 	private boolean canAcceptInput() {
 		if (!model.uiSelections.isMainActivityVisible) return false;
 		if (!hasSurface) return false;
@@ -165,14 +165,14 @@ public final class MainView extends SurfaceView
 	private static final int REDRAW_ALL_SURFACE_CHANGED = 1;
 	private static final int REDRAW_ALL_MAP_CHANGED = 2;
 	private static final int REDRAW_ALL_PLAYER_MOVED = 3;
-    private static final int REDRAW_AREA_MONSTER_MOVED = 4;
-    private static final int REDRAW_AREA_MONSTER_KILLED = 10;
-    private static final int REDRAW_AREA_EFFECT_COMPLETED = 6;
-    private static final int REDRAW_AREA_MONSTER_SPAWNED = 11;
-    private static final int REDRAW_TILE_SELECTION_REMOVED = 7;
-    private static final int REDRAW_TILE_SELECTION_ADDED = 8;
-    private static final int REDRAW_TILE_BAG = 9;
-    private static final int REDRAW_TILE_SPLATTER = 12;
+	private static final int REDRAW_AREA_MONSTER_MOVED = 4;
+	private static final int REDRAW_AREA_MONSTER_KILLED = 10;
+	private static final int REDRAW_AREA_EFFECT_COMPLETED = 6;
+	private static final int REDRAW_AREA_MONSTER_SPAWNED = 11;
+	private static final int REDRAW_TILE_SELECTION_REMOVED = 7;
+	private static final int REDRAW_TILE_SELECTION_ADDED = 8;
+	private static final int REDRAW_TILE_BAG = 9;
+	private static final int REDRAW_TILE_SPLATTER = 12;
 
 	private void redrawAll(int why) {
 		redrawArea_(mapViewArea);
@@ -194,22 +194,22 @@ public final class MainView extends SurfaceView
 		calculateRedrawRect(area);
 		Canvas c = null;
 		try {
-	        c = holder.lockCanvas(redrawRect);
-	        synchronized (holder) { synchronized (tiles) {
-	        	c.translate(screenOffset.x, screenOffset.y);
-	        	c.scale(scale, scale);
-	        	doDrawRect(c, area);
-	        } }
-	    } finally {
-	        // do this in a finally so that if an exception is thrown
-	        // during the above, we don't leave the Surface in an
-	        // inconsistent state
-	        if (c != null) {
-	        	holder.unlockCanvasAndPost(c);
-	        }
-	    }
+			c = holder.lockCanvas(redrawRect);
+			synchronized (holder) { synchronized (tiles) {
+				c.translate(screenOffset.x, screenOffset.y);
+				c.scale(scale, scale);
+				doDrawRect(c, area);
+			} }
+		} finally {
+			// do this in a finally so that if an exception is thrown
+			// during the above, we don't leave the Surface in an
+			// inconsistent state
+			if (c != null) {
+				holder.unlockCanvasAndPost(c);
+			}
+		}
 	}
-	
+
 	private boolean shouldRedrawEverythingForVisualEffect() {
 		if (preferences.optimizedDrawing) return false;
 		if (model.uiSelections.isInCombat) return false; // Discard the "optimized drawing" setting while in combat.
@@ -220,85 +220,85 @@ public final class MainView extends SurfaceView
 		CoordRect area = effect.area;
 		if (!hasSurface) return;
 		if (shouldRedrawEverythingForVisualEffect()) area = mapViewArea;
-		
+
 		if (currentMap.isOutside(area)) return;
 		if (!mapViewArea.intersects(area)) return;
-		
+
 		calculateRedrawRect(area);
 		Canvas c = null;
 		try {
-	        c = holder.lockCanvas(redrawRect);
-	        synchronized (holder) { synchronized (tiles) {
-	        	c.translate(screenOffset.x, screenOffset.y);
-	        	c.scale(scale, scale);
-	        	doDrawRect(c, area);
-	        	drawFromMapPosition(c, area, effect.position, tileID);
-    			if (effect.displayText != null) {
-    				drawEffectText(c, area, effect, textYOffset, effect.textPaint);
-    			}
-	        } }
-	    } finally {
-	        // do this in a finally so that if an exception is thrown
-	        // during the above, we don't leave the Surface in an
-	        // inconsistent state
-	        if (c != null) {
-	        	holder.unlockCanvasAndPost(c);
-	        }
-	    }
+			c = holder.lockCanvas(redrawRect);
+			synchronized (holder) { synchronized (tiles) {
+				c.translate(screenOffset.x, screenOffset.y);
+				c.scale(scale, scale);
+				doDrawRect(c, area);
+				drawFromMapPosition(c, area, effect.position, tileID);
+				if (effect.displayText != null) {
+					drawEffectText(c, area, effect, textYOffset, effect.textPaint);
+				}
+			} }
+		} finally {
+			// do this in a finally so that if an exception is thrown
+			// during the above, we don't leave the Surface in an
+			// inconsistent state
+			if (c != null) {
+				holder.unlockCanvasAndPost(c);
+			}
+		}
 	}
 	private void clearCanvas() {
 		if (!hasSurface) return;
 		Canvas c = null;
 		try {
 			c = holder.lockCanvas(null);
-	        synchronized (holder) {
-	        	c.drawColor(Color.BLACK);
-	        }
-	    } finally {
-	        // do this in a finally so that if an exception is thrown
-	        // during the above, we don't leave the Surface in an
-	        // inconsistent state
-	        if (c != null) {
-	        	holder.unlockCanvasAndPost(c);
-	        }
-	    }
+			synchronized (holder) {
+				c.drawColor(Color.BLACK);
+			}
+		} finally {
+			// do this in a finally so that if an exception is thrown
+			// during the above, we don't leave the Surface in an
+			// inconsistent state
+			if (c != null) {
+				holder.unlockCanvasAndPost(c);
+			}
+		}
 	}
-	
+
 	private void calculateRedrawRect(final CoordRect area) {
 		worldCoordsToScreenCords(area, redrawRect);
 	}
-	
+
 	private void worldCoordsToScreenCords(final CoordRect worldArea, Rect destScreenRect) {
 		destScreenRect.left = screenOffset.x + (worldArea.topLeft.x - mapViewArea.topLeft.x) * scaledTileSize;
 		destScreenRect.top = screenOffset.y + (worldArea.topLeft.y - mapViewArea.topLeft.y) * scaledTileSize;
 		destScreenRect.right = destScreenRect.left + worldArea.size.width * scaledTileSize;
 		destScreenRect.bottom = destScreenRect.top + worldArea.size.height * scaledTileSize;
 	}
-	
+
 	private void doDrawRect(Canvas canvas, CoordRect area) {
-		
-    	drawMapLayer(canvas, area, currentTileMap.currentLayout.layerGround);
-        tryDrawMapLayer(canvas, area, currentTileMap.currentLayout.layerObjects);
-        
-        for (BloodSplatter splatter : currentMap.splatters) {
-    		drawFromMapPosition(canvas, area, splatter.position, splatter.iconID);
-        }
-        
-        for (Loot l : currentMap.groundBags) {
-        	if (l.isVisible) {
-        		drawFromMapPosition(canvas, area, l.position, TileManager.iconID_groundbag);
-        	}
+
+		drawMapLayer(canvas, area, currentTileMap.currentLayout.layerGround);
+		tryDrawMapLayer(canvas, area, currentTileMap.currentLayout.layerObjects);
+
+		for (BloodSplatter splatter : currentMap.splatters) {
+			drawFromMapPosition(canvas, area, splatter.position, splatter.iconID);
 		}
-        
+
+		for (Loot l : currentMap.groundBags) {
+			if (l.isVisible) {
+				drawFromMapPosition(canvas, area, l.position, TileManager.iconID_groundbag);
+			}
+		}
+
 		drawFromMapPosition(canvas, area, playerPosition, model.player.iconID);
 		for (MonsterSpawnArea a : currentMap.spawnAreas) {
 			for (Monster m : a.monsters) {
 				drawFromMapPosition(canvas, area, m.rectPosition, m.iconID);
 			}
 		}
-		
+
 		tryDrawMapLayer(canvas, area, currentTileMap.currentLayout.layerAbove);
-        
+
 		if (model.uiSelections.selectedPosition != null) {
 			if (model.uiSelections.selectedMonster != null) {
 				drawFromMapPosition(canvas, area, model.uiSelections.selectedPosition, TileManager.iconID_attackselect);
@@ -306,57 +306,57 @@ public final class MainView extends SurfaceView
 				drawFromMapPosition(canvas, area, model.uiSelections.selectedPosition, TileManager.iconID_moveselect);
 			}
 		}
-    }
-    
+	}
+
 	private void tryDrawMapLayer(Canvas canvas, final CoordRect area, final MapLayer layer) {
-    	if (layer != null) drawMapLayer(canvas, area, layer);
-    }
-    
-    private void drawMapLayer(Canvas canvas, final CoordRect area, final MapLayer layer) {
-    	int my = area.topLeft.y;
-    	int py = (area.topLeft.y - mapViewArea.topLeft.y) * tileSize;
-    	int px0 = (area.topLeft.x - mapViewArea.topLeft.x) * tileSize;
+		if (layer != null) drawMapLayer(canvas, area, layer);
+	}
+
+	private void drawMapLayer(Canvas canvas, final CoordRect area, final MapLayer layer) {
+		int my = area.topLeft.y;
+		int py = (area.topLeft.y - mapViewArea.topLeft.y) * tileSize;
+		int px0 = (area.topLeft.x - mapViewArea.topLeft.x) * tileSize;
 		for (int y = 0; y < area.size.height; ++y, ++my, py += tileSize) {
-        	int mx = area.topLeft.x;
-        	int px = px0;
-        	for (int x = 0; x < area.size.width; ++x, ++mx, px += tileSize) {
-        		final int tile = layer.tiles[mx][my];
-        		if (tile == 0) continue;
-    			tiles.drawTile(canvas, tile, px, py, mPaint);
-            }
-        }
-    }
+			int mx = area.topLeft.x;
+			int px = px0;
+			for (int x = 0; x < area.size.width; ++x, ++mx, px += tileSize) {
+				final int tile = layer.tiles[mx][my];
+				if (tile == 0) continue;
+				tiles.drawTile(canvas, tile, px, py, mPaint);
+			}
+		}
+	}
 
 	private void drawFromMapPosition(Canvas canvas, final CoordRect area, final Coord p, final int tile) {
 		if (!area.contains(p)) return;
 		_drawFromMapPosition(canvas, area, p.x, p.y, tile);
-    }
+	}
 	private void drawFromMapPosition(Canvas canvas, final CoordRect area, final CoordRect p, final int tile) {
 		if (!area.intersects(p)) return;
 		_drawFromMapPosition(canvas, area, p.topLeft.x, p.topLeft.y, tile);
-    }
+	}
 	private void _drawFromMapPosition(Canvas canvas, final CoordRect area, int x, int y, final int tile) {
-    	x -= mapViewArea.topLeft.x;
-    	y -= mapViewArea.topLeft.y;
+		x -= mapViewArea.topLeft.x;
+		y -= mapViewArea.topLeft.y;
 		if (	   (x >= 0 && x < mapViewArea.size.width)
 				&& (y >= 0 && y < mapViewArea.size.height)) {
 			tiles.drawTile(canvas, tile, x * tileSize, y * tileSize, mPaint);
 		}
-    }
-	
+	}
+
 	private void drawEffectText(Canvas canvas, final CoordRect area, final VisualEffectAnimation e, int textYOffset, Paint textPaint) {
-    	int x = (e.position.x - mapViewArea.topLeft.x) * tileSize + tileSize/2;
-    	int y = (e.position.y - mapViewArea.topLeft.y) * tileSize + tileSize/2 + textYOffset;
+		int x = (e.position.x - mapViewArea.topLeft.x) * tileSize + tileSize/2;
+		int y = (e.position.y - mapViewArea.topLeft.y) * tileSize + tileSize/2 + textYOffset;
 		canvas.drawText(e.displayText, x, y, textPaint);
-    }
-    
+	}
+
 	@Override
 	public void onPlayerEnteredNewMap(PredefinedMap map, Coord p) {
 		synchronized (holder) {
 			currentMap = map;
 			currentTileMap = model.currentTileMap;
 			tiles = world.tileManager.currentMapTiles;
-			
+
 			Size visibleNumberOfTiles = new Size(
 					Math.min(screenSizeTileCount.width, currentMap.size.width)
 					,Math.min(screenSizeTileCount.height, currentMap.size.height)
@@ -370,26 +370,26 @@ public final class MainView extends SurfaceView
 
 			currentTileMap.setColorFilter(this.mPaint);
 		}
-		
+
 		clearCanvas();
-	    
+
 		recalculateMapTopLeft(model.player.position);
 		redrawAll(REDRAW_ALL_MAP_CHANGED);
 	}
 
 	private void recalculateMapTopLeft(Coord playerPosition) {
-		synchronized (holder) {	
+		synchronized (holder) {
 			this.playerPosition.set(playerPosition);
 			mapTopLeft.set(0, 0);
-			
-	    	if (currentMap.size.width > screenSizeTileCount.width) {
-	    		mapTopLeft.x = Math.max(0, playerPosition.x - mapViewArea.size.width/2);
-	    		mapTopLeft.x = Math.min(mapTopLeft.x, currentMap.size.width - mapViewArea.size.width);
-	    	}
-	    	if (currentMap.size.height > screenSizeTileCount.height) {
-	    		mapTopLeft.y = Math.max(0, playerPosition.y - mapViewArea.size.height/2);
-	    		mapTopLeft.y = Math.min(mapTopLeft.y, currentMap.size.height - mapViewArea.size.height);
-	    	}
+
+			if (currentMap.size.width > screenSizeTileCount.width) {
+				mapTopLeft.x = Math.max(0, playerPosition.x - mapViewArea.size.width/2);
+				mapTopLeft.x = Math.min(mapTopLeft.x, currentMap.size.width - mapViewArea.size.width);
+			}
+			if (currentMap.size.height > screenSizeTileCount.height) {
+				mapTopLeft.y = Math.max(0, playerPosition.y - mapViewArea.size.height/2);
+				mapTopLeft.y = Math.min(mapTopLeft.y, currentMap.size.height - mapViewArea.size.height);
+			}
 		}
 	}
 
@@ -437,15 +437,15 @@ public final class MainView extends SurfaceView
 
 	@Override
 	public void onMonsterSpawned(PredefinedMap map, Monster m) {
-        if (map != currentMap) return;
+		if (map != currentMap) return;
 		if (!mapViewArea.intersects(m.rectPosition)) return;
 		redrawNextTick = true;
 	}
 
 	@Override
 	public void onMonsterRemoved(PredefinedMap map, Monster m, CoordRect previousPosition) {
-        if (map != currentMap) return;
-        redrawArea(previousPosition, REDRAW_AREA_MONSTER_KILLED);
+		if (map != currentMap) return;
+		redrawArea(previousPosition, REDRAW_AREA_MONSTER_KILLED);
 	}
 
 	@Override
@@ -454,7 +454,7 @@ public final class MainView extends SurfaceView
 
 	@Override
 	public void onMonsterMoved(PredefinedMap map, Monster m, CoordRect previousPosition) {
-        if (map != currentMap) return;
+		if (map != currentMap) return;
 		if (!mapViewArea.intersects(m.rectPosition) && !mapViewArea.intersects(previousPosition)) return;
 		if (model.uiSelections.isInCombat) {
 			redrawArea(previousPosition, REDRAW_AREA_MONSTER_MOVED);
@@ -466,35 +466,35 @@ public final class MainView extends SurfaceView
 
 	@Override
 	public void onSplatterAdded(PredefinedMap map, Coord p) {
-        if (map != currentMap) return;
+		if (map != currentMap) return;
 		if (!mapViewArea.contains(p)) return;
 		redrawNextTick = true;
 	}
 
 	@Override
 	public void onSplatterChanged(PredefinedMap map, Coord p) {
-        if (map != currentMap) return;
+		if (map != currentMap) return;
 		if (!mapViewArea.contains(p)) return;
 		redrawNextTick = true;
 	}
 
 	@Override
 	public void onSplatterRemoved(PredefinedMap map, Coord p) {
-        if (map != currentMap) return;
+		if (map != currentMap) return;
 		if (!mapViewArea.contains(p)) return;
 		redrawNextTick = true;
 	}
 
 	@Override
 	public void onLootBagCreated(PredefinedMap map, Coord p) {
-        if (map != currentMap) return;
-        redrawTile(p, REDRAW_TILE_BAG);
+		if (map != currentMap) return;
+		redrawTile(p, REDRAW_TILE_BAG);
 	}
 
 	@Override
 	public void onLootBagRemoved(PredefinedMap map, Coord p) {
-        if (map != currentMap) return;
-        redrawTile(p, REDRAW_TILE_BAG);
+		if (map != currentMap) return;
+		redrawTile(p, REDRAW_TILE_BAG);
 	}
 
 	@Override
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
index 956d3affd..62844b3c1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickButton.java
@@ -16,37 +16,38 @@ import android.widget.Button;
 
 public final class QuickButton extends Button {
 	private final ColorFilter grayScaleFilter = new ColorMatrixColorFilter(
-			new float[] { 0.30f, 0.59f, 0.11f, 0.0f, 0.0f,
-                          0.30f, 0.59f, 0.11f, 0.0f, 0.0f,
-                          0.30f, 0.59f, 0.11f, 0.0f, 0.0f,
-                          0.00f, 0.00f, 0.00f, 1.0f, 0.0f
+			new float[] {
+				0.30f, 0.59f, 0.11f, 0.0f, 0.0f,
+				0.30f, 0.59f, 0.11f, 0.0f, 0.0f,
+				0.30f, 0.59f, 0.11f, 0.0f, 0.0f,
+				0.00f, 0.00f, 0.00f, 1.0f, 0.0f
 			});
 	private boolean empty;
 	private final QuickButtonContextMenuInfo menuInfo;
 	private final int textPadding;
-	
+
 	public QuickButton(Context context, AttributeSet attrs) {
 		super(context, attrs);
 		menuInfo = new QuickButtonContextMenuInfo();
 		textPadding = getResources().getDimensionPixelSize(R.dimen.boxshape_margin);
 	}
-	
+
 	public void setIndex(int index){
 		menuInfo.index = index;
 	}
-	
+
 	public int getIndex(){
 		return menuInfo.index;
 	}
-	
+
 	@Override
 	protected ContextMenu.ContextMenuInfo getContextMenuInfo() {
 		return menuInfo;
 	}
-	
+
 	private String currentItemID = "unassigned";
 	public void setItemType(ItemType type, WorldContext world, TileCollection tiles) {
-        final Resources res = getContext().getResources();
+		final Resources res = getContext().getResources();
 
 		if (type == null) {
 			if (currentItemID == null) return;
@@ -68,11 +69,11 @@ public final class QuickButton extends Button {
 			setText(Integer.toString(quantity));
 		}
 	}
-	
+
 	private void setGrayScale(boolean useGrayscale) {
 		getCompoundDrawables()[0].setColorFilter(useGrayscale ? grayScaleFilter : null);
 	}
-	
+
 	public boolean isEmpty() {
 		return empty;
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
index a0c15c6cd..b2bfc29c1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/QuickitemView.java
@@ -35,10 +35,10 @@ public final class QuickitemView extends LinearLayout implements OnClickListener
 
 	public QuickitemView(Context context, AttributeSet attrs) {
 		super(context, attrs);
-	    AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
-	    this.world = app.getWorld();
-        this.controllers = app.getControllerContext();
-        setFocusable(false);
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
+		this.world = app.getWorld();
+		this.controllers = app.getControllerContext();
+		setFocusable(false);
 
 		int position = app.getPreferences().quickslotsPosition;
 		switch(position) {
@@ -55,7 +55,7 @@ public final class QuickitemView extends LinearLayout implements OnClickListener
 				break;
 		}
 
-        Resources res = getResources();
+		Resources res = getResources();
 		this.setBackgroundColor(res.getColor(color.transparent));
 
 		for(int i = 0; i < NUM_QUICK_SLOTS; ++i) {
@@ -67,7 +67,7 @@ public final class QuickitemView extends LinearLayout implements OnClickListener
 			addView(item);
 		}
 	}
-	
+
 	public boolean isQuickButtonId(int id){
 		for(QuickButton item: buttons){
 			if(item.getId()==id)
@@ -75,7 +75,7 @@ public final class QuickitemView extends LinearLayout implements OnClickListener
 		}
 		return false;
 	}
-	
+
 	@Override
 	public void onClick(View v) {
 		QuickButton button = (QuickButton)v;
@@ -83,23 +83,23 @@ public final class QuickitemView extends LinearLayout implements OnClickListener
 			return;
 		controllers.itemController.quickitemUse(button.getIndex());
 	}
-	
+
 	@Override
 	public void setVisibility(int visibility) {
 		if(visibility==VISIBLE)
 			refreshQuickitems();
 		super.setVisibility(visibility);
 	}
-	
+
 	public void refreshQuickitems() {
 		loadItemTypeImages();
-		
+
 		for (int i = 0; i < NUM_QUICK_SLOTS; ++i){
 			ItemType type = world.model.player.inventory.quickitem[i];
 			buttons[i].setItemType(type, world, tiles);
 		}
 	}
-	
+
 	private void loadItemTypeImages() {
 		boolean shouldLoadImages = false;
 		for (ItemType type : world.model.player.inventory.quickitem) {
@@ -110,14 +110,14 @@ public final class QuickitemView extends LinearLayout implements OnClickListener
 			}
 		}
 		if (!shouldLoadImages) return;
-		
+
 		HashSet<Integer> iconIDs = new HashSet<Integer>();
-		
+
 		for (ItemType type : world.model.player.inventory.quickitem) {
 			if (type == null) continue;
 			iconIDs.add(type.iconID);
 		}
-		
+
 		loadedTileIDs.clear();
 		loadedTileIDs.addAll(iconIDs);
 		tiles = world.tileManager.loadTilesFor(iconIDs, getResources());
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
index ed67c73a3..5379a950c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/RangeBar.java
@@ -13,16 +13,16 @@ public final class RangeBar extends RelativeLayout {
 	private final ProgressBar progressBar;
 	private final TextView progressBarText;
 	private final TextView labelText;
-	
+
 	public RangeBar(Context context, AttributeSet attr) {
 		super(context, attr);
-        setFocusable(false);
-        inflate(context, R.layout.rangebar, this);
-        
-        progressBarText = (TextView) findViewById(R.id.rangebar_text);
-        progressBar = (ProgressBar) findViewById(R.id.rangebar_progress);
-        labelText = (TextView) findViewById(R.id.rangebar_label);
-    }
+		setFocusable(false);
+		inflate(context, R.layout.rangebar, this);
+
+		progressBarText = (TextView) findViewById(R.id.rangebar_text);
+		progressBar = (ProgressBar) findViewById(R.id.rangebar_progress);
+		labelText = (TextView) findViewById(R.id.rangebar_label);
+	}
 
 	public void init(int drawableID, int labelTextID) {
 		// Wow, you actually need to call this twice (!), or the progressbar won't show the progress image, just the background.
@@ -31,11 +31,11 @@ public final class RangeBar extends RelativeLayout {
 		progressBar.setProgressDrawable(getResources().getDrawable(drawableID));
 		labelText.setText(labelTextID);
 	}
-	
+
 	public void update(final Range range) { update(range.max, range.current); }
 	public void update(final int max, final int current) {
 		progressBar.setProgress(0); // http://stackoverflow.com/questions/4348032/android-progressbar-does-not-update-progress-view-drawable
-		
+
 		progressBar.setMax(max);
 		progressBar.setProgress(Math.min(current, max));
 		progressBarText.setText(current + "/" + max);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
index 5759b0647..9868c29c1 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/ShopItemContainerAdapter.java
@@ -26,7 +26,7 @@ public final class ShopItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 	private final boolean isSelling;
 	private final Resources r;
 	private final Player player;
-	
+
 	public ShopItemContainerAdapter(Context context, TileCollection tileCollection, TileManager tileManager, Player player, ItemContainer items, OnContainerItemClickedListener clickListener, boolean isSelling) {
 		super(context, 0, items.items);
 		this.tileManager = tileManager;
@@ -41,12 +41,12 @@ public final class ShopItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 	public View getView(final int position, View convertView, ViewGroup parent) {
 		final ItemEntry item = getItem(position);
 		final ItemType itemType = item.itemType;
-		
+
 		View result = convertView;
 		if (result == null) {
 			result = View.inflate(getContext(), R.layout.shopitemview, null);
 		}
-		
+
 		tileManager.setImageViewTile(r, (ImageView) result.findViewById(R.id.shopitem_image), itemType, tileCollection);
 		((TextView) result.findViewById(R.id.shopitem_text)).setText(ItemController.describeItemForListView(item, player));
 		Button b = (Button) result.findViewById(R.id.shopitem_shopbutton);
@@ -73,12 +73,12 @@ public final class ShopItemContainerAdapter extends ArrayAdapter<ItemEntry> {
 		});
 		return result;
 	}
-	
+
 	@Override
 	public long getItemId(int position) {
 		return getItem(position).itemType.id.hashCode();
 	}
-	
+
 	public static interface OnContainerItemClickedListener {
 		void onItemActionClicked(int position, ItemType itemType);
 		void onItemInfoClicked(int position, ItemType itemType);
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
index 148bb9ac9..fbe29191d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SkillListAdapter.java
@@ -24,7 +24,7 @@ import android.widget.TextView;
 public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
 	private final Resources r;
 	private final Player player;
-	
+
 	public SkillListAdapter(Context context, Collection<SkillInfo> skills, Player player) {
 		super(context, 0, filterNondisplayedSkills(skills, player));
 		this.r = context.getResources();
@@ -37,7 +37,7 @@ public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
 			if (shouldDisplaySkill(skill, player)) result.add(skill);
 		}
 		Collections.sort(result, new Comparator<SkillInfo>() {
-    		@Override
+			@Override
 			public int compare(SkillInfo a, SkillInfo b) {
 				return a.id.ordinal() - b.id.ordinal();
 			}
@@ -55,16 +55,16 @@ public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
 	public View getView(final int position, View convertView, ViewGroup parent) {
 		final SkillInfo skill = getItem(position);
 		final SkillCollection.SkillID skillID = skill.id;
-		
+
 		View result = convertView;
 		if (result == null) {
 			result = View.inflate(getContext(), R.layout.skill_listentry_view, null);
 		}
-		
+
 		final ImageView icon = (ImageView) result.findViewById(R.id.skillentry_icon);
 		final TextView title = (TextView) result.findViewById(R.id.skillentry_title);
 		final TextView description = (TextView) result.findViewById(R.id.skillentry_description);
-		
+
 		String skillTitle = r.getString(SkillInfoActivity.getSkillTitleResourceID(skillID));
 		final int skillLevel = player.getSkillLevel(skillID);
 		if (skillLevel > 0) {
@@ -72,7 +72,7 @@ public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
 		}
 		title.setText(skillTitle);
 		description.setText(getSkillShortDescriptionResourceID(skillID));
-		
+
 		boolean enabled;
 		if (player.hasAvailableSkillpoints()) {
 			enabled = SkillController.canLevelupSkillManually(player, skill);
@@ -82,15 +82,15 @@ public final class SkillListAdapter extends ArrayAdapter<SkillInfo> {
 		icon.setEnabled(enabled);
 		title.setEnabled(enabled);
 		description.setEnabled(enabled);
-		
+
 		return result;
 	}
-	
+
 	@Override
 	public long getItemId(int position) {
 		return getItem(position).id.ordinal();
 	}
-	
+
 	private static int getSkillShortDescriptionResourceID(SkillCollection.SkillID skill) {
 		switch (skill) {
 		case weaponChance: return R.string.skill_shortdescription_weapon_chance;
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
index fb6badcf6..bfd35c1c5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/StatusView.java
@@ -23,11 +23,11 @@ import android.widget.RelativeLayout;
 import android.widget.ImageButton;
 
 public final class StatusView extends RelativeLayout implements PlayerStatsListener, ActorStatsListener {
-	
+
 	private final ControllerContext controllers;
 	private final WorldContext world;
 	private final Player player;
-	
+
 	private final RangeBar healthBar;
 	private final RangeBar expBar;
 	private final ImageButton heroImage;
@@ -36,19 +36,19 @@ public final class StatusView extends RelativeLayout implements PlayerStatsListe
 
 	public StatusView(final Context context, AttributeSet attr) {
 		super(context, attr);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
-        this.controllers = app.getControllerContext();
-        this.world = app.getWorld();
-        this.player = world.model.player;
-        
-        setFocusable(false);
-        inflate(context, R.layout.statusview, this);
-        this.setBackgroundResource(R.drawable.ui_gradientshape);
-        
-        heroImage = (ImageButton) findViewById(R.id.status_image);
-        showingLevelup = true;
-        
-        heroImage.setOnClickListener(new OnClickListener() {
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
+		this.controllers = app.getControllerContext();
+		this.world = app.getWorld();
+		this.player = world.model.player;
+
+		setFocusable(false);
+		inflate(context, R.layout.statusview, this);
+		this.setBackgroundResource(R.drawable.ui_gradientshape);
+
+		heroImage = (ImageButton) findViewById(R.id.status_image);
+		showingLevelup = true;
+
+		heroImage.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
 				context.startActivity(new Intent(context, HeroinfoActivity.class));
@@ -56,20 +56,20 @@ public final class StatusView extends RelativeLayout implements PlayerStatsListe
 		});
 		healthBar = (RangeBar) findViewById(R.id.statusview_health);
 		healthBar.init(R.drawable.ui_progress_health, R.string.status_hp);
-        
+
 		expBar = (RangeBar) findViewById(R.id.statusview_exp);
 		expBar.init(R.drawable.ui_progress_exp, R.string.status_exp);
 
-        Resources res = getResources();
-        levelupDrawable = new LayerDrawable(new Drawable[] {
+		Resources res = getResources();
+		levelupDrawable = new LayerDrawable(new Drawable[] {
 				new BitmapDrawable(res, world.tileManager.preloadedTiles.getBitmap(player.iconID))
 				,new BitmapDrawable(res, world.tileManager.preloadedTiles.getBitmap(TileManager.iconID_moveselect))
 		});
 
 		updateStatus();
-        updateIcon(player.canLevelup());
-    }
-	
+		updateIcon(player.canLevelup());
+	}
+
 	public void registerToolboxViews(ToolboxView toolbox, QuickitemView quickitemView) {
 		toolbox.registerToolboxViews((ImageButton) findViewById(R.id.toolbox_toggle), quickitemView);
 	}
@@ -78,7 +78,7 @@ public final class StatusView extends RelativeLayout implements PlayerStatsListe
 		updateHealth();
 		updateExperience();
 	}
-	
+
 	public void subscribe() {
 		controllers.actorStatsController.actorStatsListeners.add(this);
 		controllers.actorStatsController.playerStatsListeners.add(this);
@@ -87,7 +87,7 @@ public final class StatusView extends RelativeLayout implements PlayerStatsListe
 		controllers.actorStatsController.playerStatsListeners.remove(this);
 		controllers.actorStatsController.actorStatsListeners.remove(this);
 	}
-	
+
 	private void updateHealth() {
 		healthBar.update(player.getMaxHP(), player.getCurrentHP());
 	}
@@ -104,7 +104,7 @@ public final class StatusView extends RelativeLayout implements PlayerStatsListe
 		if (canLevelUp) {
 			heroImage.setImageDrawable(levelupDrawable);
 		} else {
-			world.tileManager.setImageViewTile(heroImage, player);			
+			world.tileManager.setImageViewTile(heroImage, player);
 		}
 	}
 
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
index ded568798..9033e327d 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/TraitsInfoView.java
@@ -11,10 +11,10 @@ import android.widget.TableRow;
 import android.widget.TextView;
 
 public final class TraitsInfoView {
-	
+
 	public static void update(ViewGroup group, Actor actor) {
 		TableLayout actorinfo_stats_table = (TableLayout) group.findViewById(R.id.actorinfo_stats_table);
-		
+
 		updateTraitsTable(
 			actorinfo_stats_table
 			,actor.getMoveCost()
@@ -26,7 +26,7 @@ public final class TraitsInfoView {
 			,actor.getBlockChance()
 			,actor.getDamageResistance()
 			,actor.isImmuneToCriticalHits());
-		
+
 		TextView actorinfo_currentconditions_title = (TextView) group.findViewById(R.id.actorinfo_currentconditions_title);
 		ActorConditionList actorinfo_currentconditions = (ActorConditionList) group.findViewById(R.id.actorinfo_currentconditions);
 		if (actor.conditions.isEmpty()) {
@@ -38,7 +38,7 @@ public final class TraitsInfoView {
 			actorinfo_currentconditions.update(actor.conditions);
 		}
 	}
-	
+
 	public static void updateTraitsTable(
 			ViewGroup group
 			,int moveCost
@@ -53,10 +53,10 @@ public final class TraitsInfoView {
 		) {
 		TableRow row;
 		TextView tv;
-		
+
 		tv = (TextView) group.findViewById(R.id.traitsinfo_move_cost);
 		tv.setText(Integer.toString(moveCost));
-		
+
 		tv = (TextView) group.findViewById(R.id.traitsinfo_attack_cost);
 		tv.setText(Integer.toString(attackCost));
 
@@ -68,7 +68,7 @@ public final class TraitsInfoView {
 			tv = (TextView) group.findViewById(R.id.traitsinfo_attack_chance);
 			tv.setText(Integer.toString(attackChance) + '%');
 		}
-		
+
 		row = (TableRow) group.findViewById(R.id.traitsinfo_attack_damage_row);
 		if (damagePotential != null && damagePotential.max != 0) {
 			row.setVisibility(View.VISIBLE);
@@ -77,7 +77,7 @@ public final class TraitsInfoView {
 		} else {
 			row.setVisibility(View.GONE);
 		}
-		
+
 		row = (TableRow) group.findViewById(R.id.traitsinfo_criticalhit_skill_row);
 		if (criticalSkill == 0) {
 			row.setVisibility(View.GONE);
@@ -86,7 +86,7 @@ public final class TraitsInfoView {
 			tv = (TextView) group.findViewById(R.id.traitsinfo_criticalhit_skill);
 			tv.setText(Integer.toString(criticalSkill));
 		}
-		
+
 		row = (TableRow) group.findViewById(R.id.traitsinfo_criticalhit_multiplier_row);
 		if (criticalMultiplier != 0 && criticalMultiplier != 1) {
 			row.setVisibility(View.VISIBLE);
@@ -95,7 +95,7 @@ public final class TraitsInfoView {
 		} else {
 			row.setVisibility(View.GONE);
 		}
-		
+
 		row = (TableRow) group.findViewById(R.id.traitsinfo_criticalhit_effectivechance_row);
 		if (criticalSkill != 0 && criticalMultiplier != 0 && criticalMultiplier != 1) {
 			row.setVisibility(View.VISIBLE);
@@ -104,7 +104,7 @@ public final class TraitsInfoView {
 		} else {
 			row.setVisibility(View.GONE);
 		}
-		
+
 		row = (TableRow) group.findViewById(R.id.traitsinfo_block_chance_row);
 		if (blockChance == 0) {
 			row.setVisibility(View.GONE);
@@ -113,7 +113,7 @@ public final class TraitsInfoView {
 			tv = (TextView) group.findViewById(R.id.traitsinfo_block_chance);
 			tv.setText(Integer.toString(blockChance) + '%');
 		}
-		
+
 		row = (TableRow) group.findViewById(R.id.traitsinfo_damageresist_row);
 		if (damageResistance == 0) {
 			row.setVisibility(View.GONE);
@@ -122,7 +122,7 @@ public final class TraitsInfoView {
 			tv = (TextView) group.findViewById(R.id.traitsinfo_damageresist);
 			tv.setText(Integer.toString(damageResistance));
 		}
-		
+
 		row = (TableRow) group.findViewById(R.id.traitsinfo_is_immune_to_critical_hits_row);
 		row.setVisibility(isImmuneToCriticalHits ? View.VISIBLE : View.GONE);
 	}
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
index 4f48e916e..5155e5127 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/VirtualDpadView.java
@@ -19,7 +19,7 @@ import com.gpl.rpg.AndorsTrail.controller.InputController;
 public final class VirtualDpadView extends ImageView implements OnClickListener {
 	private final WorldContext world;
 	private final InputController inputController;
-	
+
 	private int one_third_width;
 	private int two_thirds_width;
 	private int full_width;
@@ -30,59 +30,59 @@ public final class VirtualDpadView extends ImageView implements OnClickListener
 	private int lastTouchPosition_dx;
 	private int lastTouchPosition_dy;
 	private boolean isMinimizeable = true;
-	
+
 	public VirtualDpadView(final Context context, AttributeSet attr) {
 		super(context, attr);
-        AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
-        this.world = app.getWorld();
+		AndorsTrailApplication app = AndorsTrailApplication.getApplicationFromActivityContext(context);
+		this.world = app.getWorld();
 		final ControllerContext controllers = app.getControllerContext();
-        this.inputController = controllers.inputController;
+		this.inputController = controllers.inputController;
 
-        setImageResource(R.drawable.ui_dpad);
-        setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
-        setFocusable(false);
-        setOnClickListener(this);
-        
-        setAdjustViewBounds(true);
-    }
+		setImageResource(R.drawable.ui_dpad);
+		setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
+		setFocusable(false);
+		setOnClickListener(this);
+
+		setAdjustViewBounds(true);
+	}
 
 	@Override
 	protected void onSizeChanged(int w, int h, int oldw, int oldh) {
 		if (!isMinimized) {
-		    one_third_width = w / 3;
-	        two_thirds_width = w * 2 / 3;
-	        full_width = w;
-	        one_third_height = h / 3;
-	        two_thirds_height = h * 2 / 3;
-	        full_height = h;
+			one_third_width = w / 3;
+			two_thirds_width = w * 2 / 3;
+			full_width = w;
+			one_third_height = h / 3;
+			two_thirds_height = h * 2 / 3;
+			full_height = h;
 		}
-		
-        super.onSizeChanged(w, h, oldw, oldh);
+
+		super.onSizeChanged(w, h, oldw, oldh);
 	}
 
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
 		if (isMinimized) return super.onTouchEvent(event);
-		
+
 		if (!world.model.uiSelections.isMainActivityVisible) return true;
-		
+
 		switch (event.getAction()) {
 		case MotionEvent.ACTION_DOWN:
 		case MotionEvent.ACTION_MOVE:
-			
+
 			final int x = (int)event.getX();
 			lastTouchPosition_dx = 0;
 			if (x < one_third_width) lastTouchPosition_dx = -1;
 			else if (x >= two_thirds_width) lastTouchPosition_dx = 1;
-			
+
 			final int y = (int)event.getY();
 			lastTouchPosition_dy = 0;
 			if (y < one_third_height) lastTouchPosition_dy = -1;
 			else if (y >= two_thirds_height) lastTouchPosition_dy = 1;
-			
+
 			// Minimize the dpad if enabled in options - otherwise attack or move(0, 0)
 			if (isMinimizeable && lastTouchPosition_dx == 0 && lastTouchPosition_dy == 0) break;
-			
+
 			this.inputController.onRelativeMovement(lastTouchPosition_dx, lastTouchPosition_dy);
 			return true;
 		case MotionEvent.ACTION_UP:
@@ -93,17 +93,17 @@ public final class VirtualDpadView extends ImageView implements OnClickListener
 		}
 		return super.onTouchEvent(event);
 	}
-	
+
 	public void updateVisibility(AndorsTrailPreferences preferences) {
 		int dpadPosition = preferences.dpadPosition;
 		if (dpadPosition == AndorsTrailPreferences.DPAD_POSITION_DISABLED) {
 			setVisibility(View.GONE);
 			return;
 		}
-		
+
 		setVisibility(View.VISIBLE);
 		isMinimizeable = preferences.dpadMinimizeable;
-		
+
 		RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
 		switch (dpadPosition) {
 			case AndorsTrailPreferences.DPAD_POSITION_LOWER_RIGHT:
@@ -139,7 +139,7 @@ public final class VirtualDpadView extends ImageView implements OnClickListener
 				params.addRule(RelativeLayout.CENTER_VERTICAL);
 				break;
 		}
-		
+
 		setLayoutParams(params);
 	}