Merge branch 'master' into story_61

Also got client-server handshake working. Multiple clients can connect and control their own boat.
The client's boat has a larger black triangle drawn around it. Probably needs tidying up.
Added isClientBoat boolean to VisualiserBoat.

WindGenerator is now an interface, implemented by ConstantWindGenerator (useful for testing) and RandomWindGenerator. Added ConstantWindGeneratorTest.
RandomWindGenerator was formerly WindGenerator.
The WindGenerator is passed in to MockRace.

CommandFactory throws a CommandConstructionException if it cannot create a command.

MessageSerialiser and MessageDeserialiser correctly terminate on error.

Readded VisualiserInput's switch statement in the main loop, pending a refactor.

Removed the sleep statement from LobbyController - it was blocking javaFX thread.

Lobby.fxml: moved buttons and text input into grid panes, so they don't break when you resize screen.

Added some test object creation functions in several test classes (MockRaceTest.createMockRace(), BoatXMLReaderTest.createBoatDataSource(), etc...).

#story[1095]

racevisionGame/src/main/java/mock/model/RaceLogic.java

@@ -2,14 +2,15 @@ package mock.model;
 
 import javafx.animation.AnimationTimer;
 import mock.model.commandFactory.CompositeCommand;
+import mock.model.commandFactory.CommandFactory;
+import network.Messages.Enums.BoatActionEnum;
 import network.Messages.Enums.BoatStatusEnum;
 import network.Messages.Enums.RaceStatusEnum;
 import network.Messages.LatestMessages;
+import shared.model.RunnableWithFramePeriod;
 
 
-
-public class RaceLogic implements Runnable {
-
+public class RaceLogic implements RunnableWithFramePeriod {
     /**
      * State of current race modified by this object
      */
@@ -66,6 +67,7 @@ public class RaceLogic implements Runnable {
             //Parse the race snapshot.
             server.parseSnapshot();
 
+
             // Change wind direction
             race.changeWindDirection();
 
@@ -113,7 +115,7 @@ public class RaceLogic implements Runnable {
             currentTime = System.currentTimeMillis();
 
             //Execute commands from clients.
-            commands.execute(race);
+            commands.execute();
 
             //Update race time.
             race.updateRaceTime(currentTime);
@@ -172,4 +174,12 @@ public class RaceLogic implements Runnable {
         }
     };
 
+
+    /**
+     * Returns the race state that this RaceLogic is simulating.
+     * @return Race state this RaceLogic is simulating.
+     */
+    public MockRace getRace() {
+        return race;
+    }
 }