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/network/Messages/LatestMessages.java

@@ -34,9 +34,6 @@ public class LatestMessages extends Observable {
     private XMLMessage regattaXMLMessage;
 
 
-
-
-
     /**
      * Ctor.
      */
@@ -46,6 +43,7 @@ public class LatestMessages extends Observable {
 
     /**
      * Returns a copy of the race snapshot.
+     *
      * @return Copy of the race snapshot.
      */
     public List<AC35Data> getSnapshot() {
@@ -55,6 +53,7 @@ public class LatestMessages extends Observable {
 
     /**
      * Sets the snapshot of the race.
+     *
      * @param snapshot New snapshot of race.
      */
     public void setSnapshot(List<AC35Data> snapshot) {
@@ -62,12 +61,9 @@ public class LatestMessages extends Observable {
     }
 
 
-
-
-
-
     /**
      * Returns the latest race xml message.
+     *
      * @return The latest race xml message.
      */
     public XMLMessage getRaceXMLMessage() {
@@ -76,6 +72,7 @@ public class LatestMessages extends Observable {
 
     /**
      * Sets the latest race xml message to a specified race XML message.
+     *
      * @param raceXMLMessage The new race XML message to use.
      */
     public void setRaceXMLMessage(XMLMessage raceXMLMessage) {
@@ -88,6 +85,7 @@ public class LatestMessages extends Observable {
 
     /**
      * Returns the latest boat xml message.
+     *
      * @return The latest boat xml message.
      */
     public XMLMessage getBoatXMLMessage() {
@@ -96,6 +94,7 @@ public class LatestMessages extends Observable {
 
     /**
      * Sets the latest boat xml message to a specified boat XML message.
+     *
      * @param boatXMLMessage The new boat XML message to use.
      */
     public void setBoatXMLMessage(XMLMessage boatXMLMessage) {
@@ -108,6 +107,7 @@ public class LatestMessages extends Observable {
 
     /**
      * Returns the latest regatta xml message.
+     *
      * @return The latest regatta xml message.
      */
     public XMLMessage getRegattaXMLMessage() {
@@ -116,6 +116,7 @@ public class LatestMessages extends Observable {
 
     /**
      * Sets the latest regatta xml message to a specified regatta XML message.
+     *
      * @param regattaXMLMessage The new regatta XML message to use.
      */
     public void setRegattaXMLMessage(XMLMessage regattaXMLMessage) {
@@ -127,6 +128,7 @@ public class LatestMessages extends Observable {
 
     /**
      * Checks the type of xml message, and places it in this LatestMessages object.
+     *
      * @param xmlMessage The new xml message to use.
      */
     public void setXMLMessage(XMLMessage xmlMessage) {
@@ -146,10 +148,12 @@ public class LatestMessages extends Observable {
 
     /**
      * Returns whether or not there is an xml message for each message type.
+     *
      * @return True if race, boat, and regatta have an xml message, false otherwise.
      */
     public boolean hasAllXMLMessages() {
-        if (this.regattaXMLMessage == null || this.boatXMLMessage == null || this.raceXMLMessage == null) {
+        if (this.regattaXMLMessage == null || this.boatXMLMessage == null ||
+                this.raceXMLMessage == null) {
             return false;
 
         } else {
@@ -160,4 +164,4 @@ public class LatestMessages extends Observable {
 
     }
 
-}
+}