Merge remote-tracking branch 'origin/wake_remake' into develop

# Conflicts:
#	src/main/java/seng302/App.java

src/main/java/seng302/controllers/CanvasController.java

@@ -300,6 +300,8 @@ public class CanvasController {
     private void drawFps(int fps){
         if (raceViewController.isDisplayFps()){
             gc.clearRect(5,5,50,20);
+            gc.setFill(Color.SKYBLUE);
+            gc.fillRect(4,4,51,21);
             gc.setFill(Color.BLACK);
             gc.setFont(new Font(14));
             gc.setLineWidth(3);