Merge branch 'production'

Conflicts:
	AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java

diff --cc AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
index 8341c65eeabe4bc4cba0738e6250c3d8eae49368,26567d5676be422586d5a2b69a833ccf189f76fa..8a36325a4b417ad621d740d9a2dad3c6c03d37bb
--- 1/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
--- 2/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/CombatController.java
@@@ -264,10 -265,12 +265,12 @@@ public final class CombatController imp
        }
        private void playerActionCompleted() {
                context.mainActivity.updateStatus();
 -              if (!playerHasApLeft()) endPlayerTurn();
 +              if (!playerHasApLeft()) beginMonsterTurn(false);
        }
        private void continueTurn() {
-       if (!playerHasApLeft()) handleNextMonsterAction();
+               if (model.uiSelections.isPlayersCombatTurn) return;
+               if (playerHasApLeft()) return;
+               handleNextMonsterAction();
        }
  
        private void executeCombatMove(final Coord dest) {
@@@ -302,8 -305,9 +305,9 @@@
          }
        };
        
 -      public void endPlayerTurn() {
 +      public void beginMonsterTurn(boolean isFirstRound) {
                model.player.ap.current = 0;
+               model.uiSelections.isPlayersCombatTurn = false;
                for (MonsterSpawnArea a : model.currentMap.spawnAreas) {
                        for (Monster m : a.monsters) {
                                m.setMaxAP();
@@@ -397,12 -409,12 +402,13 @@@
        }
        private void endMonsterTurn() {
                currentActiveMonster = null;
 -              newPlayerTurn();
 +              newPlayerTurn(false);
        }
        
 -      private void newPlayerTurn() {
 +      private void newPlayerTurn(boolean isFirstRound) {
                model.player.setMaxAP();
 +              if (!isFirstRound) context.gameRoundController.onNewPlayerRound();
+               model.uiSelections.isPlayersCombatTurn = true;
        updateTurnInfo();
        }
        private void updateTurnInfo() {