Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36 # Conflicts: # mock/src/main/java/seng302/DataInput/XMLReader.java # visualiser/src/main/java/seng302/Controllers/RaceController.java # visualiser/src/main/java/seng302/Mock/StreamedRace.java # visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java # visualiser/src/main/resources/scenes/race.fxml #story[878]