Merge branch 'develop' into Story47CourseLimits

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

src/main/java/seng302/App.java

@@ -61,7 +61,7 @@ public class App extends Application {
             }
         }
         //Change the StreamReceiver in this else block to change the default data source.
-        else {
+        else{
             sr = new StreamReceiver("localhost", 4949, "RaceStream");
         }
 
@@ -71,7 +71,6 @@ public class App extends Application {
 
         launch(args);
 
-
     }
 }