Added boat trails to the boat group, fixed annotations

- Set colours for the annotations
- Added boat trails back into the boat group
- Re-added time until next mark and time since last mark rounding

#story[923]

src/main/java/seng302/controllers/CanvasController.java

@@ -181,7 +181,7 @@ public class CanvasController {
         for (MarkGroup markGroup : markGroups) {
             for (int id : markGroup.getRaceIds()) {
                 if (StreamParser.boatPositions.containsKey(id)) {
-                    UpdateMarkGroup(id, markGroup);
+                    updateMarkGroup(id, markGroup);
                 }
             }
         }
@@ -214,7 +214,7 @@ public class CanvasController {
         }
     }
 
-    void UpdateMarkGroup (int raceId, MarkGroup markGroup) {
+    void updateMarkGroup (int raceId, MarkGroup markGroup) {
         PriorityBlockingQueue<BoatPositionPacket> movementQueue = StreamParser.boatPositions.get(raceId);
         if (movementQueue.size() > 0){
             try {