Merge remote-tracking branch 'origin/master' into story_51_rounding_fix

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java

Also added keybindings.xml to git ignore.
#story[1185]

racevisionGame/src/main/java/mock/model/RaceServer.java

@@ -23,6 +23,7 @@ import java.util.logging.Logger;
 public class RaceServer {
     private MockRace race;
     private LatestMessages latestMessages;
+    private static RaceServer server;
 
 
     /**
@@ -47,10 +48,17 @@ public class RaceServer {
 
 
     public RaceServer(MockRace race, LatestMessages latestMessages) {
+        server = this;
         this.race = race;
         this.latestMessages = latestMessages;
     }
 
+    public static void staticUpdateXML() {
+        if (server != null) {
+            server.updateXMLFiles();
+        }
+    }
+
     /**
      * Parses the race to create a snapshot, and places it in latestMessages.
      */

racevisionGame/src/main/java/mock/model/SourceIdAllocator.java

@@ -42,6 +42,7 @@ public class SourceIdAllocator {
         }
 
         List<Integer> allocatedIDs = mockRace.getRaceDataSource().getParticipants();
+
         List<Integer> allIDs = new ArrayList<>(mockRace.getBoatDataSource().getBoats().keySet());
 
         //Get list of unallocated ids.