Merge remote-tracking branch 'origin/feature-runesgame-devel' into feature-runesgame-devel

# Conflicts:
#	core/src/cz/nic/tablexia/game/games/runes/RunesGame.java

core/src/cz/nic/tablexia/game/games/runes/RunesGame.java

@@ -29,6 +29,7 @@ import cz.nic.tablexia.game.games.runes.model.RunesGameState;
 import cz.nic.tablexia.loader.TablexiaAbstractFileManager;
 import cz.nic.tablexia.loader.TablexiaTextureManager;
 import cz.nic.tablexia.shared.model.Game;
+import cz.nic.tablexia.util.Log;
 import cz.nic.tablexia.util.ui.dialog.components.FixedSpaceContentDialogComponent;
 import cz.nic.tablexia.util.ui.dialog.components.TablexiaDialogComponentAdapter;
 import cz.nic.tablexia.util.ui.dialog.components.TextContentDialogComponent;
@@ -135,7 +136,7 @@ public class RunesGame extends AbstractTablexiaGame<RunesGameState> {
         placeRunes();
     }
     
-        @Override
+    @Override
     protected RunesGameState prepareGameData(Map<String, String> gameState) {
         final Object loaderLock = new Object();
             
@@ -163,10 +164,11 @@ public class RunesGame extends AbstractTablexiaGame<RunesGameState> {
             try {
                 loaderLock.wait();
             } catch (InterruptedException e) {
+                Log.err(getClass(), "Loader lock waiting problem!", e);
             }
         }
-            return new RunesGameState();
-        }
+        return new RunesGameState();
+    }
 
     @Override
     protected void gameRender(float delta) {

core/src/cz/nic/tablexia/game/games/runes/assets/RuneDefinition.java

@@ -164,5 +164,5 @@ public enum RuneDefinition implements AssetDescription {
         return newDefinitionsList;
     }
     
-    }
+}