Merge remote-tracking branch 'refs/remotes/external/master' into bug1978-docked-video-component

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java

@@ -499,6 +499,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
         // controls at RIGHT would not get the correct top setting
         map.setControls(ControlPosition.TOP_RIGHT, headerPanel);
     }
+    
     private void createSettingsButton(MapWidget map) {
         final Component<RaceMapSettings> component = this;
         Button settingsButton = new Button();

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/streamlets/Swarm.java

@@ -18,7 +18,7 @@ public class Swarm implements TimeListener {
     private final FullCanvasOverlay fullcanvas;
     private final Canvas canvas;
     private final MapWidget map;
-	private StreamletParameters parameters; 
+    private StreamletParameters parameters; 
 
     private Timer loopTimer;
     private Mercator projection;