Merge branch 'master' into jbross-email-invitation

Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch

java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/IconResources.java

@@ -0,0 +1,13 @@
+package com.sap.sse.gwt.client;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.ImageResource;
+
+public interface IconResources extends ClientBundle {
+    
+    public static final IconResources INSTANCE = GWT.create(IconResources.class);
+
+    @Source("images/remove.png")
+    ImageResource removeIcon();
+}

java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/panels/VerticalTabLayoutPanel.java

@@ -175,7 +175,7 @@ public class VerticalTabLayoutPanel extends ResizeComposite implements HasWidget
   }
 
   interface VerticalTabLayoutPanelResources extends ClientBundle {
-      @Source("com/sap/sse/gwt/resources/VerticalTabLayoutPanel.css")
+      @Source("VerticalTabLayoutPanel.css")
       CssResource verticalTabPanelStyles();
   }