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

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
#	settings/keyBindings.xml

racevisionGame/src/main/java/mock/app/Event.java

@@ -7,6 +7,7 @@ import mock.model.Polars;
 import mock.model.RaceLogic;
 import mock.model.SourceIdAllocator;
 import mock.model.commandFactory.CompositeCommand;
+import mock.xml.RaceXMLCreator;
 import network.Messages.Enums.RaceStatusEnum;
 import network.Messages.HostGame;
 import mock.model.wind.RandomWindGenerator;

racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java

@@ -294,7 +294,9 @@ public class InGameLobbyController extends Controller {
             visualiserRaceEvent.terminate();
 
             try{
-                App.game.endEvent();
+                if(isHost) {
+                    App.game.endEvent();
+                }
                 loadScene("title.fxml");
 
             }catch (IOException ignore){};