Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36

# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#story[878]

mock/src/main/java/seng302/Model/Race.java

@@ -3,7 +3,6 @@ package seng302.Model;
 import javafx.animation.AnimationTimer;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import seng302.Constants;
 import seng302.DataInput.RaceDataSource;
 import seng302.MockOutput;
@@ -14,8 +13,6 @@ import seng302.Networking.Messages.Enums.RaceStatusEnum;
 import seng302.Networking.Messages.Enums.RaceTypeEnum;
 import seng302.Networking.Messages.RaceStatus;
 
-
-import java.io.*;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;