Merge branch 'master' into MapWindRotation

# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
#	racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java
#	racevisionGame/src/main/java/shared/model/CompoundMark.java
#	racevisionGame/src/main/java/shared/model/Mark.java
#	racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/app/VisualiserInput.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
#	racevisionGame/src/main/java/visualiser/model/VisualiserRace.java

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

@@ -7,6 +7,7 @@ import javafx.scene.layout.AnchorPane;
 import javafx.stage.Stage;
 import mock.app.Event;
 import org.xml.sax.SAXException;
+import mock.exceptions.EventConstructionException;
 import shared.exceptions.InvalidBoatDataException;
 import shared.exceptions.InvalidRaceDataException;
 import shared.exceptions.InvalidRegattaDataException;
@@ -20,6 +21,8 @@ import java.net.Socket;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Controller for Hosting a game.
@@ -47,23 +50,12 @@ public class HostController extends Controller {
      */
     public void hostGamePressed() throws IOException{
         try {
-            Event game = Event.getEvent();
+            Event game = new Event(false);
             game.start();
             connectSocket("localhost", 4942);
-        } catch (InvalidRaceDataException e) {
-            e.printStackTrace();
-        } catch (XMLReaderException e) {
-            e.printStackTrace();
-        } catch (InvalidBoatDataException e) {
-            e.printStackTrace();
-        } catch (InvalidRegattaDataException e) {
-            e.printStackTrace();
-        } catch (SAXException e) {
-            e.printStackTrace();
-        } catch (JAXBException e) {
-            e.printStackTrace();
-        } catch (ParserConfigurationException e) {
-            e.printStackTrace();
+        } catch (EventConstructionException e) {
+            Logger.getGlobal().log(Level.SEVERE, "Could not create Event.", e);
+            throw new RuntimeException(e);
         }
     }
 
@@ -89,7 +81,6 @@ public class HostController extends Controller {
      */
     public void hostGame(){
         hostWrapper.setVisible(true);
-        System.out.println("Reacted hostGame");
     }
 
 }