Merge branch 'develop' into issue47_disconnect_crash_rebranch

# Conflicts:
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameClient.java

src/test/java/seng302/ColorsTest.java

@@ -12,7 +12,7 @@ public class ColorsTest {
         Color expectedColors[] = {Color.RED, Color.PERU, Color.GOLD, Color.GREEN, Color.BLUE,
             Color.PURPLE, Color.DEEPPINK, Color.GRAY};
         for (int i = 0; i < 8; i++) {
-            Assert.assertEquals(expectedColors[i], Colors.getColor());
+            Assert.assertEquals(expectedColors[i], Colors.getColor(i));
         }
     }
 }

src/test/java/seng302/models/YachtTest.java

@@ -21,7 +21,7 @@ public class YachtTest {
 
     @BeforeClass
     public static void setUp() {
-        y1 = new ServerYacht("Yacht", 101, "Y1", "Y1", "Yacht 1", "C1");
+        y1 = new ServerYacht("Yacht", 1, "Y1", "Y1", "Yacht 1", "C1");
         gs = new GameState("localhost");
     }