Merge branch 'feature-nightwatch' into 'devel'

Feature nightwatch

V případě konfliktu prosím ponechat vytvoření pixmapy tak, jak je to v develu, tzn v metodě:
 protected int[][] prepareGameData(Map<String, String> gameState)

See merge request !55

core/src/cz/nic/tablexia/game/games/night_watch/solution/GameSolutionGenerator.java

@@ -25,7 +25,7 @@ public class GameSolutionGenerator {
                 int totalWindows = GameRulesHelper.getNumberOfWindowsForDifficulty(difficulty);
                 int lightenedWindows = GameRulesHelper.getNumberOfWindowsLightenedInCurrentRound(difficulty,i);
 
-                Solution currentRoundSolution = new Solution(PropertiesGenerator.getRandomWindowSequence(totalWindows,lightenedWindows,random),PropertiesGenerator.getRandomTime());
+                Solution currentRoundSolution = new Solution(PropertiesGenerator.getRandomWindowSequence(totalWindows,lightenedWindows,random),PropertiesGenerator.getRandomTime(random));
                 currentLevelSolutions.add(currentRoundSolution);
             }
             mapToReturn.put(i,currentLevelSolutions);

core/src/cz/nic/tablexia/game/games/night_watch/solution/PropertiesGenerator.java

@@ -27,8 +27,7 @@ public class PropertiesGenerator {
 
     }
 
-    public static int getRandomTime(){
-        Random r = new Random();
+    public static int getRandomTime(Random r){
         return r.nextInt((MAX_TIME - MIN_TIME) + 1) + MIN_TIME;
     }
 }