Merge remote-tracking branch 'remotes/origin/master' into story77

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/resources/visualiser/scenes/main.fxml
#	settings/keyBindings.xml

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

@@ -21,10 +21,9 @@ import java.util.logging.Logger;
  * Created by connortaylorbrown on 2/08/17.
  */
 public class RaceServer {
-    private static RaceServer server;//this is for updating xml files as I cannot find an elegant way to do this and since it is near the end of the sprint we shouldn't be doing large scale refactors
-
     private MockRace race;
     private LatestMessages latestMessages;
+    private static RaceServer server;
 
 
     /**
@@ -54,6 +53,12 @@ public class RaceServer {
         this.latestMessages = latestMessages;
     }
 
+    public static void staticUpdateXML() {
+        if (server != null) {
+            server.updateXMLFiles();
+        }
+    }
+
     /**
      * Parses the race to create a snapshot, and places it in latestMessages.
      */
@@ -75,13 +80,6 @@ public class RaceServer {
         updateXMLFiles();
     }
 
-
-    public static void staticUpdateXML(){
-        if (server != null){
-            server.updateXMLFiles();
-        }
-    }
-
     /**
      * Checks if the race/boat/regatta data sources have changed, and if they have, update their xml representations.
      */