Merge branch 'develop' of https://eng-git.canterbury.ac.nz/seng302-2017/team-13 into develop

# Conflicts:
#	src/test/java/seng302/models/MarkGroupTest.java

src/main/java/seng302/App.java

@@ -39,12 +39,18 @@ public class App extends Application
             e.printStackTrace();
         }
 
+        if (args.length == 1 && args[0].equals("-standalone")){
+            return;
+        }
+
         if (args.length == 3 && args[0].equals("-server")){
+
             sr = new StreamReceiver(args[1], Integer.valueOf(args[2]), "RaceStream");
+
         } else if(args.length == 2 && args[0].equals("-server")){
             switch (args[1]) {
                 case "internal":
-                    sr = new StreamReceiver("localhost", 8085, "RaceStream");
+                    sr = new StreamReceiver("localhost", 4949, "RaceStream");
                     break;
                 case "staffserver":
                     sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
@@ -56,9 +62,7 @@ public class App extends Application
         }
         //Change the StreamReceiver in this else block to change the default data source.
         else{
-            sr = new StreamReceiver("localhost", 8085, "RaceStream");
+            sr = new StreamReceiver("localhost", 4949, "RaceStream");
-//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
-//            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream");
         }
 
         sr.start();
@@ -66,6 +70,9 @@ public class App extends Application
         streamParser.start();
 
         launch(args);
+
+
+
     }
 }
 

src/main/java/seng302/server/ServerThread.java

@@ -21,7 +21,7 @@ public class ServerThread implements Runnable, Observer {
     private final int RACE_STATUS_PERIOD = 1000/2;
     private final int RACE_START_STATUS_PERIOD = 1000;
     private final int BOAT_LOCATION_PERIOD = 1000/5;
-    private final int PORT_NUMBER = 8085;
+    private final int PORT_NUMBER = 4949;
     private final int TIME_TILL_RACE_START = 20*1000;
     private static final int LOG_LEVEL = 1;