Merge branch '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/model/View3D.java

racevisionGame/src/main/java/network/Messages/Enums/RaceTypeEnum.java

@@ -71,6 +71,8 @@ public enum RaceTypeEnum {
     }
 
 
+
+
     /**
      * Stores a mapping between Byte values and RaceStatusEnum values.
      */
@@ -107,4 +109,14 @@ public enum RaceTypeEnum {
     }
 
 
+    @Override
+    public String toString() {
+        if (fromByte(value) == FLEET_RACE) {
+            return "fleet";
+        } else if (fromByte(value) == MATCH_RACE) {
+            return "match";
+        } else {
+            return super.toString();
+        }
+    }
 }

racevisionGame/src/main/java/network/Messages/LatestMessages.java

@@ -35,6 +35,7 @@ public class LatestMessages extends Observable {
 
 
 
+
     /**
      * Ctor.
      */