Merge remote-tracking branch 'origin/story1118_map_arrows' into 1124_Fixing_Order_And_Finish_Screen

# Conflicts:
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/visualiser/GameClient.java
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
#	src/main/resources/server_config/xml_templates/race.ftlh

src/main/java/seng302/gameServer/GameState.java

@@ -444,6 +444,7 @@ public class GameState implements Runnable {
             yacht.setHasPassedThroughGate(false);
             if (!markOrder.isLastMark(currentMarkSeqID)) {
                 yacht.incrementMarkSeqID();
+                yacht.incrementLegNumber();
             }
         }
     }

src/main/java/seng302/gameServer/MainServerThread.java

@@ -227,7 +227,8 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
 
         for (Player player : GameState.getPlayers()) {
             ServerYacht y = player.getYacht();
-            BoatSubMessage m = new BoatSubMessage(y.getSourceId(), y.getBoatStatus(), 0,
+            BoatSubMessage m = new BoatSubMessage(y.getSourceId(), y.getBoatStatus(),
+                y.getLegNumber(),
                 0, 0, 1234L,
                 1234L);
             boatSubMessages.add(m);