Merged Develop into branch.

tags : #story[1142]

src/main/java/seng302/visualiser/GameClient.java

@@ -95,7 +95,7 @@ public class GameClient {
 
     /**
      * Connect to a game as the host at the given address and starts the visualiser.
-     * @param ipAddress IP to connect to.
+     * @param ipAdclientYachtsdress IP to connect to.
      * @param portNumber Port to connect to.
      */
     public void runAsHost(String ipAddress, Integer portNumber) {
@@ -130,7 +130,7 @@ public class GameClient {
         });
 
         this.lobbyController = lobbyController;
-        server.setGameClient(this);
+        //server.setGameClient(this);
     }
 
     private void loadStartScreen() {

src/main/java/seng302/visualiser/GameView.java

@@ -474,7 +474,7 @@ public class GameView extends Pane {
     public void setBoats(List<ClientYacht> yachts) {
         BoatObject newBoat;
         final List<Group> wakes = new ArrayList<>();
-        for (ClientYacht clientYacht : clientYachts) {
+        for (ClientYacht clientYacht : yachts) {
             Paint colour = clientYacht.getColour();
             newBoat = new BoatObject();
             newBoat.addSelectedBoatListener(this::setSelectedBoat);