Merge branch 'develop' into story61_player_perspective

# Conflicts:
#	src/main/java/seng302/fxObjects/BoatAnnotations.java
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/ServerToClientThread.java
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/visualiser/controllers/LobbyController.java

src/main/java/seng302/visualiser/ClientToServerThread.java

@@ -152,7 +152,7 @@ public class ClientToServerThread implements Runnable {
         try {
             socket.close();
         } catch (IOException e) {
-            System.out.println("IO error in server thread upon trying to close socket");
+            clientLog("Failed to close the socket", 0);
         }
     }