diff --git a/java/com.sap.sailing.gwt.ui/.settings/com.google.gdt.eclipse.core.prefs b/java/com.sap.sailing.gwt.ui/.settings/com.google.gdt.eclipse.core.prefs
index 2b75d62eb7f..f29a4ec7cf1 100644
--- a/java/com.sap.sailing.gwt.ui/.settings/com.google.gdt.eclipse.core.prefs
+++ b/java/com.sap.sailing.gwt.ui/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,7 +1,7 @@
-#Mon Jan 02 13:21:10 CET 2012
+#Tue Jan 03 11:21:40 CET 2012
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=C\:/Users/D054527/git/sapsailingcapture/java/com.sap.sailing.gwt.ui/war
+lastWarOutDir=C\:/data/SAP/sailing/workspace/java/com.sap.sailing.gwt.ui/src/main/resources
 launchConfigExternalUrlPrefix=
 warSrcDir=war
 warSrcDirIsOutput=false
diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
index 0c29386556d..506514738a0 100755
--- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
@@ -39,4 +39,3 @@ Import-Package: org.osgi.framework,
  org.json.simple,
  org.json.simple.parser
 Web-ContextPath: /gwt
-Jetty-WarFolderPath: war
diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
index 128727f64d8..d173f05c583 100644
--- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch
+++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch
@@ -5,10 +5,8 @@
 <booleanAttribute key="com.google.gdt.eclipse.suiteWarArgumentProcessor.IS_WAR_FROM_PROJECT_PROPERTIES" value="true"/>
 <listAttribute key="com.google.gwt.eclipse.core.ENTRY_POINT_MODULES">
 <listEntry value="com.sap.sailing.gwt.ui.UserManagement"/>
-<listEntry value="com.sap.sailing.gwt.ui.LeaderboardEditing"/>
-<listEntry value="com.sap.sailing.gwt.ui.Leaderboard"/>
-<listEntry value="com.sap.sailing.gwt.ui.AdminConsole"/>
 </listAttribute>
+<stringAttribute key="com.google.gwt.eclipse.core.URL" value="/gwt/AdminConsole.html"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/com.sap.sailing.gwt.ui"/>
 </listAttribute>
@@ -21,7 +19,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gwt.eclipse.core.moduleClasspathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war &quot;${project_loc:com.sap.sailing.gwt.ui}/war&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 com.sap.sailing.gwt.ui.AdminConsole com.sap.sailing.gwt.ui.Leaderboard com.sap.sailing.gwt.ui.LeaderboardEditing com.sap.sailing.gwt.ui.UserManagement"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-war &quot;${project_loc:com.sap.sailing.gwt.ui}/src/main/resources&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9997 -startupUrl /gwt/AdminConsole.html com.sap.sailing.gwt.ui.AdminConsole -startupUrl /gwt/Leaderboard.html com.sap.sailing.gwt.ui.Leaderboard -startupUrl /gwt/LeaderboardEditing.html com.sap.sailing.gwt.ui.LeaderboardEditing -startupUrl /gwt/UserManagement.html com.sap.sailing.gwt.ui.UserManagement"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.gwt.ui"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m"/>
 </launchConfiguration>
diff --git a/java/com.sap.sailing.gwt.ui/pom.xml b/java/com.sap.sailing.gwt.ui/pom.xml
index a52586e9cbc..d1879938b30 100644
--- a/java/com.sap.sailing.gwt.ui/pom.xml
+++ b/java/com.sap.sailing.gwt.ui/pom.xml
@@ -78,7 +78,7 @@
 		      </modules>
 		      <gen>${basedir}/.generated</gen>
 		      <localWorkers>4</localWorkers>
-		      <webappDirectory>war</webappDirectory>
+		      <webappDirectory>src/main/resources</webappDirectory>
 		      <warSourceDirectory>${basedir}/src/main/resources</warSourceDirectory>
 	        </configuration>
             <goals>
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/.gitignore b/java/com.sap.sailing.gwt.ui/src/main/resources/.gitignore
new file mode 100644
index 00000000000..79036ea614f
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/.gitignore
@@ -0,0 +1,4 @@
+com.sap.sailing.gwt.ui.AdminConsole
+com.sap.sailing.gwt.ui.Leaderboard
+com.sap.sailing.gwt.ui.LeaderboardEditing
+com.sap.sailing.gwt.ui.UserManagement
diff --git a/java/com.sap.sailing.gwt.ui/war/AdminConsole.css b/java/com.sap.sailing.gwt.ui/src/main/resources/AdminConsole.css
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/AdminConsole.css
rename to java/com.sap.sailing.gwt.ui/src/main/resources/AdminConsole.css
diff --git a/java/com.sap.sailing.gwt.ui/war/AdminConsole.html b/java/com.sap.sailing.gwt.ui/src/main/resources/AdminConsole.html
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/AdminConsole.html
rename to java/com.sap.sailing.gwt.ui/src/main/resources/AdminConsole.html
diff --git a/java/com.sap.sailing.gwt.ui/war/Leaderboard.css b/java/com.sap.sailing.gwt.ui/src/main/resources/Leaderboard.css
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/Leaderboard.css
rename to java/com.sap.sailing.gwt.ui/src/main/resources/Leaderboard.css
diff --git a/java/com.sap.sailing.gwt.ui/war/Leaderboard.html b/java/com.sap.sailing.gwt.ui/src/main/resources/Leaderboard.html
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/Leaderboard.html
rename to java/com.sap.sailing.gwt.ui/src/main/resources/Leaderboard.html
diff --git a/java/com.sap.sailing.gwt.ui/war/LeaderboardEditing.html b/java/com.sap.sailing.gwt.ui/src/main/resources/LeaderboardEditing.html
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/LeaderboardEditing.html
rename to java/com.sap.sailing.gwt.ui/src/main/resources/LeaderboardEditing.html
diff --git a/java/com.sap.sailing.gwt.ui/war/UserManagement.html b/java/com.sap.sailing.gwt.ui/src/main/resources/UserManagement.html
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/UserManagement.html
rename to java/com.sap.sailing.gwt.ui/src/main/resources/UserManagement.html
diff --git a/java/com.sap.sailing.gwt.ui/war/WEB-INF/.gitignore b/java/com.sap.sailing.gwt.ui/src/main/resources/WEB-INF/.gitignore
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/WEB-INF/.gitignore
rename to java/com.sap.sailing.gwt.ui/src/main/resources/WEB-INF/.gitignore
diff --git a/java/com.sap.sailing.gwt.ui/war/WEB-INF/web.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/WEB-INF/web.xml
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/WEB-INF/web.xml
rename to java/com.sap.sailing.gwt.ui/src/main/resources/WEB-INF/web.xml
diff --git a/java/com.sap.sailing.gwt.ui/war/crossdomain.xml b/java/com.sap.sailing.gwt.ui/src/main/resources/crossdomain.xml
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/crossdomain.xml
rename to java/com.sap.sailing.gwt.ui/src/main/resources/crossdomain.xml
diff --git a/java/com.sap.sailing.gwt.ui/war/images/BlueBoats/BlueDW_Port.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/BlueBoats/BlueDW_Port.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/BlueBoats/BlueDW_Port.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/BlueBoats/BlueDW_Port.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/BlueBoats/BlueDW_Starbord.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/BlueBoats/BlueDW_Starbord.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/BlueBoats/BlueDW_Starbord.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/BlueBoats/BlueDW_Starbord.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/BlueBoats/Blue_Port.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/BlueBoats/Blue_Port.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/BlueBoats/Blue_Port.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/BlueBoats/Blue_Port.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/BlueBoats/Blue_Starbord.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/BlueBoats/Blue_Starbord.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/BlueBoats/Blue_Starbord.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/BlueBoats/Blue_Starbord.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/DarkGreyBoats/DarkGreyDW_Port.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/DarkGreyBoats/DarkGreyDW_Port.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/DarkGreyBoats/DarkGreyDW_Port.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/DarkGreyBoats/DarkGreyDW_Port.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/DarkGreyBoats/DarkGreyDW_Starbord.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/DarkGreyBoats/DarkGreyDW_Starbord.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/DarkGreyBoats/DarkGreyDW_Starbord.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/DarkGreyBoats/DarkGreyDW_Starbord.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/DarkGreyBoats/DarkGrey_Port.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/DarkGreyBoats/DarkGrey_Port.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/DarkGreyBoats/DarkGrey_Port.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/DarkGreyBoats/DarkGrey_Port.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/DarkGreyBoats/DarkGrey_Starbord.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/DarkGreyBoats/DarkGrey_Starbord.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/DarkGreyBoats/DarkGrey_Starbord.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/DarkGreyBoats/DarkGrey_Starbord.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/LightGreyBoats/LightGreyDW_Port.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/LightGreyBoats/LightGreyDW_Port.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/LightGreyBoats/LightGreyDW_Port.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/LightGreyBoats/LightGreyDW_Port.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/LightGreyBoats/LightGreyDW_Starbord.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/LightGreyBoats/LightGreyDW_Starbord.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/LightGreyBoats/LightGreyDW_Starbord.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/LightGreyBoats/LightGreyDW_Starbord.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/LightGreyBoats/LightGrey_Port.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/LightGreyBoats/LightGrey_Port.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/LightGreyBoats/LightGrey_Port.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/LightGreyBoats/LightGrey_Port.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/LightGreyBoats/LightGrey_Starbord.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/LightGreyBoats/LightGrey_Starbord.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/LightGreyBoats/LightGrey_Starbord.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/LightGreyBoats/LightGrey_Starbord.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/StartFinishBoat/start_finishboat.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/StartFinishBoat/start_finishboat.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/StartFinishBoat/start_finishboat.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/StartFinishBoat/start_finishboat.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/YellowBoats/YellowDW_Port.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/YellowBoats/YellowDW_Port.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/YellowBoats/YellowDW_Port.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/YellowBoats/YellowDW_Port.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/YellowBoats/YellowDW_Starbord.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/YellowBoats/YellowDW_Starbord.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/YellowBoats/YellowDW_Starbord.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/YellowBoats/YellowDW_Starbord.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/YellowBoats/Yellow_Port.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/YellowBoats/Yellow_Port.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/YellowBoats/Yellow_Port.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/YellowBoats/Yellow_Port.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/YellowBoats/Yellow_Starbord.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/YellowBoats/Yellow_Starbord.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/YellowBoats/Yellow_Starbord.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/YellowBoats/Yellow_Starbord.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/ajax-loader.gif b/java/com.sap.sailing.gwt.ui/src/main/resources/images/ajax-loader.gif
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/ajax-loader.gif
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/ajax-loader.gif
diff --git a/java/com.sap.sailing.gwt.ui/war/images/arrow-gain-loss.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/arrow-gain-loss.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/arrow-gain-loss.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/arrow-gain-loss.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/arrow-gain.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/arrow-gain.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/arrow-gain.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/arrow-gain.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/arrow-loss.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/arrow-loss.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/arrow-loss.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/arrow-loss.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/boat-selected16.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/boat-selected16.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/boat-selected16.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/boat-selected16.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/boat-selected32.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/boat-selected32.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/boat-selected32.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/boat-selected32.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/boat.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/boat.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/boat.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/boat.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/boat16.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/boat16.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/boat16.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/boat16.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/boat32.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/boat32.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/boat32.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/boat32.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/chart_small.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/chart_small.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/chart_small.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/chart_small.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/close.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/close.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/close.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/close.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ad.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ad.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ad.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ad.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ae.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ae.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ae.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ae.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/af.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/af.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/af.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/af.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ag.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ag.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ag.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ag.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ai.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ai.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ai.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ai.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/al.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/al.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/al.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/al.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/am.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/am.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/am.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/am.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/an.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/an.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/an.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/an.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ao.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ao.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ao.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ao.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ar.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ar.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ar.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ar.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/as.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/as.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/as.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/as.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/at.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/at.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/at.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/at.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/au.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/au.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/au.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/au.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/aw.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/aw.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/aw.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/aw.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ax.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ax.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ax.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ax.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/az.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/az.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/az.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/az.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ba.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ba.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ba.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ba.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bb.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bb.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bb.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bb.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bd.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bd.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bd.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bd.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/be.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/be.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/be.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/be.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bf.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bf.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bf.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bf.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bh.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bh.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bh.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bh.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bi.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bi.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bi.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bi.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bj.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bj.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bj.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bj.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bo.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bo.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bo.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bo.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/br.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/br.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/br.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/br.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bs.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bs.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bs.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bs.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bt.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bt.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bt.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bt.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bv.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bv.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bv.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bv.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bw.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bw.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bw.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bw.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/by.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/by.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/by.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/by.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/bz.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bz.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/bz.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/bz.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ca.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ca.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ca.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ca.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/catalonia.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/catalonia.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/catalonia.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/catalonia.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cc.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cc.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cc.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cc.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cd.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cd.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cd.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cd.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cf.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cf.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cf.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cf.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ch.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ch.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ch.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ch.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ci.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ci.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ci.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ci.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ck.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ck.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ck.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ck.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cl.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cl.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cl.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cl.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/co.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/co.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/co.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/co.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cs.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cs.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cs.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cs.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cu.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cu.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cu.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cu.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cv.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cv.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cv.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cv.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cx.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cx.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cx.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cx.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cy.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cy.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cy.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cy.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/cz.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cz.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/cz.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/cz.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/de.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/de.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/de.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/de.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/dj.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/dj.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/dj.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/dj.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/dk.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/dk.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/dk.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/dk.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/dm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/dm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/dm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/dm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/do.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/do.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/do.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/do.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/dz.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/dz.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/dz.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/dz.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ec.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ec.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ec.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ec.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ee.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ee.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ee.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ee.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/eg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/eg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/eg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/eg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/eh.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/eh.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/eh.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/eh.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/england.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/england.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/england.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/england.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/er.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/er.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/er.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/er.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/es.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/es.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/es.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/es.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/et.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/et.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/et.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/et.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/europeanunion.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/europeanunion.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/europeanunion.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/europeanunion.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/fam.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fam.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/fam.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fam.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/fi.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fi.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/fi.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fi.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/fj.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fj.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/fj.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fj.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/fk.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fk.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/fk.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fk.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/fm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/fm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/fo.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fo.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/fo.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fo.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/fr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/fr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/fr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ga.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ga.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ga.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ga.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gb.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gb.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gb.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gb.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gd.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gd.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gd.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gd.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ge.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ge.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ge.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ge.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gf.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gf.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gf.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gf.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gh.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gh.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gh.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gh.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gi.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gi.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gi.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gi.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gl.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gl.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gl.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gl.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gp.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gp.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gp.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gp.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gq.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gq.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gq.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gq.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gs.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gs.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gs.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gs.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gt.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gt.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gt.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gt.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gu.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gu.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gu.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gu.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gw.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gw.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gw.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gw.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/gy.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gy.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/gy.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/gy.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/hk.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hk.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/hk.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hk.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/hm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/hm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/hn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/hn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/hr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/hr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ht.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ht.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ht.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ht.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/hu.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hu.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/hu.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/hu.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/id.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/id.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/id.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/id.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ie.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ie.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ie.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ie.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/il.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/il.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/il.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/il.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/in.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/in.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/in.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/in.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/io.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/io.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/io.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/io.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/iq.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/iq.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/iq.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/iq.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ir.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ir.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ir.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ir.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/is.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/is.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/is.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/is.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/it.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/it.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/it.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/it.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/jm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/jm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/jm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/jm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/jo.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/jo.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/jo.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/jo.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/jp.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/jp.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/jp.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/jp.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ke.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ke.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ke.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ke.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/kg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/kg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/kh.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kh.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/kh.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kh.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ki.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ki.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ki.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ki.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/km.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/km.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/km.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/km.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/kn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/kn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/kp.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kp.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/kp.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kp.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/kr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/kr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/kw.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kw.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/kw.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kw.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ky.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ky.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ky.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ky.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/kz.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kz.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/kz.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/kz.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/la.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/la.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/la.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/la.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/lb.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lb.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/lb.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lb.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/lc.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lc.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/lc.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lc.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/li.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/li.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/li.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/li.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/lk.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lk.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/lk.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lk.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/lr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/lr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ls.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ls.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ls.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ls.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/lt.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lt.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/lt.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lt.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/lu.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lu.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/lu.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lu.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/lv.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lv.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/lv.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/lv.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ly.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ly.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ly.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ly.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ma.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ma.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ma.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ma.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mc.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mc.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mc.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mc.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/md.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/md.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/md.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/md.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/me.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/me.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/me.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/me.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mh.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mh.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mh.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mh.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mk.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mk.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mk.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mk.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ml.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ml.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ml.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ml.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mo.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mo.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mo.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mo.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mp.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mp.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mp.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mp.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mq.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mq.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mq.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mq.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ms.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ms.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ms.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ms.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mt.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mt.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mt.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mt.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mu.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mu.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mu.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mu.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mv.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mv.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mv.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mv.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mw.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mw.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mw.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mw.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mx.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mx.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mx.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mx.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/my.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/my.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/my.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/my.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/mz.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mz.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/mz.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/mz.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/na.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/na.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/na.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/na.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/nc.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nc.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/nc.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nc.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ne.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ne.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ne.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ne.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/nf.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nf.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/nf.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nf.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ng.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ng.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ng.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ng.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ni.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ni.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ni.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ni.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/nl.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nl.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/nl.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nl.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/no.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/no.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/no.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/no.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/np.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/np.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/np.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/np.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/nr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/nr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/nu.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nu.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/nu.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nu.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/nz.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nz.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/nz.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/nz.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/om.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/om.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/om.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/om.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pa.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pa.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pa.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pa.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pe.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pe.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pe.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pe.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pf.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pf.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pf.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pf.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ph.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ph.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ph.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ph.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pk.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pk.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pk.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pk.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pl.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pl.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pl.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pl.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ps.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ps.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ps.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ps.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pt.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pt.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pt.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pt.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/pw.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pw.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/pw.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/pw.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/py.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/py.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/py.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/py.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/qa.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/qa.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/qa.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/qa.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/re.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/re.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/re.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/re.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ro.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ro.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ro.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ro.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/rs.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/rs.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/rs.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/rs.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ru.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ru.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ru.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ru.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/rw.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/rw.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/rw.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/rw.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sa.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sa.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sa.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sa.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sb.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sb.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sb.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sb.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sc.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sc.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sc.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sc.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/scotland.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/scotland.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/scotland.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/scotland.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sd.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sd.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sd.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sd.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/se.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/se.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/se.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/se.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sh.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sh.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sh.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sh.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/si.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/si.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/si.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/si.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sj.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sj.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sj.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sj.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sk.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sk.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sk.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sk.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sl.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sl.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sl.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sl.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/so.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/so.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/so.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/so.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/st.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/st.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/st.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/st.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sv.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sv.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sv.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sv.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sy.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sy.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sy.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sy.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/sz.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sz.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/sz.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/sz.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tc.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tc.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tc.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tc.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/td.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/td.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/td.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/td.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tf.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tf.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tf.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tf.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/th.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/th.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/th.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/th.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tj.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tj.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tj.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tj.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tk.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tk.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tk.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tk.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tl.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tl.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tl.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tl.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/to.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/to.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/to.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/to.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tr.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tr.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tr.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tr.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tt.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tt.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tt.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tt.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tv.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tv.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tv.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tv.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tw.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tw.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tw.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tw.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/tz.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tz.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/tz.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/tz.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ua.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ua.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ua.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ua.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ug.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ug.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ug.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ug.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/um.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/um.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/um.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/um.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/us.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/us.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/us.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/us.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/uy.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/uy.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/uy.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/uy.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/uz.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/uz.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/uz.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/uz.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/va.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/va.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/va.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/va.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/vc.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vc.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/vc.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vc.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ve.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ve.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ve.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ve.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/vg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/vg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/vi.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vi.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/vi.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vi.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/vn.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vn.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/vn.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vn.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/vu.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vu.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/vu.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/vu.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/wales.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/wales.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/wales.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/wales.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/wf.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/wf.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/wf.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/wf.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ws.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ws.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ws.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ws.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/ye.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ye.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/ye.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/ye.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/yt.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/yt.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/yt.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/yt.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/za.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/za.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/za.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/za.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/zm.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/zm.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/zm.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/zm.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/flags/zw.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/zw.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/flags/zw.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/flags/zw.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/greyBar.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/greyBar.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/greyBar.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/greyBar.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/header_bg.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/header_bg.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/header_bg.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/header_bg.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/magnifier.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/magnifier.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/magnifier.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/magnifier.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/magnifier_slashed.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/magnifier_slashed.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/magnifier_slashed.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/magnifier_slashed.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/maneuver.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/maneuver.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/maneuver.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/maneuver.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/medal.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/medal.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/medal.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/medal.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/medal_small.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/medal_small.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/medal_small.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/medal_small.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/minus.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/minus.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/minus.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/minus.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/open.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/open.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/open.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/open.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/pause_16.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/pause_16.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/pause_16.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/pause_16.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/play_16.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/play_16.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/play_16.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/play_16.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/plus.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/plus.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/plus.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/plus.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/refresh.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/refresh.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/refresh.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/refresh.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/refresh_with_right_border.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/refresh_with_right_border.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/refresh_with_right_border.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/refresh_with_right_border.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/safe-water-small.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/safe-water-small.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/safe-water-small.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/safe-water-small.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/safe-water.jpg b/java/com.sap.sailing.gwt.ui/src/main/resources/images/safe-water.jpg
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/safe-water.jpg
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/safe-water.jpg
diff --git a/java/com.sap.sailing.gwt.ui/war/images/sap.ico b/java/com.sap.sailing.gwt.ui/src/main/resources/images/sap.ico
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/sap.ico
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/sap.ico
diff --git a/java/com.sap.sailing.gwt.ui/war/images/sap_300_transparent.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/sap_300_transparent.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/sap_300_transparent.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/sap_300_transparent.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/sap_66_transparent.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/sap_66_transparent.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/sap_66_transparent.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/sap_66_transparent.png
diff --git a/java/com.sap.sailing.gwt.ui/war/images/settings.png b/java/com.sap.sailing.gwt.ui/src/main/resources/images/settings.png
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/images/settings.png
rename to java/com.sap.sailing.gwt.ui/src/main/resources/images/settings.png
diff --git a/java/com.sap.sailing.gwt.ui/war/reset.css b/java/com.sap.sailing.gwt.ui/src/main/resources/reset.css
similarity index 100%
rename from java/com.sap.sailing.gwt.ui/war/reset.css
rename to java/com.sap.sailing.gwt.ui/src/main/resources/reset.css
diff --git a/java/com.sap.sailing.gwt.ui/war/.gitignore b/java/com.sap.sailing.gwt.ui/war/.gitignore
deleted file mode 100644
index 0233c553290..00000000000
--- a/java/com.sap.sailing.gwt.ui/war/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/com.sap.sailing.gwt.ui.Leaderboard
-/com.sap.sailing.gwt.ui.LeaderboardEditing
-/com.sap.sailing.gwt.ui.AdminConsole
-/com.sap.sailing.gwt.ui.UserManagement
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy).launch b/java/com.sap.sailing.server/SailingServer (No Proxy).launch
index 92161f3e7c7..6b306c3d8f7 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy).launch	
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy).launch	
@@ -17,7 +17,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dexpedition.udp.port=2010 -Xmx1024m -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dexpedition.udp.port=2010 -Xmx1024m -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="target_bundles" value="com.sap.ui5.commons@default:default,com.sap.ui5.core@default:default,com.sap.ui5.gwt.commons@default:default,com.sap.ui5.gwt.core@default:default,com.sap.ui5.resource.osgi@default:false,com.sap.ui5.resource@default:default,javax.servlet@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.nested@default:default,org.eclipse.jetty.osgi.boot@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,slf4j.api@default:default,slf4j.jdk14@default:false"/>
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
index 90cfdf93367..f76add55ea4 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch	
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch	
@@ -17,7 +17,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dexpedition.udp.port=2010 -Xmx1024m -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dexpedition.udp.port=2010 -Xmx1024m -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
index 896206f3ed0..60a0ad0c4a6 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch	
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch	
@@ -17,10 +17,10 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Xmx2048m -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Xmx2048m -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="com.sap.ui5.commons@default:default,com.sap.ui5.core@default:default,com.sap.ui5.gwt.commons@default:default,com.sap.ui5.gwt.core@default:default,com.sap.ui5.resource.osgi@default:default,com.sap.ui5.resource@default:default,javax.servlet@default:default,org.eclipse.equinox.transforms.hook@default:default,org.eclipse.osgi@-1:true"/>
+<stringAttribute key="target_bundles" value="com.sap.ui5.commons@default:default,com.sap.ui5.core@default:default,com.sap.ui5.gwt.commons@default:default,com.sap.ui5.gwt.core@default:default,com.sap.ui5.resource.osgi@default:false,com.sap.ui5.resource@default:default,javax.servlet@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.osgi@-1:true"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfigArea" value="false"/>
diff --git a/java/com.sap.sailing.server/SailingServer (Proxy).launch b/java/com.sap.sailing.server/SailingServer (Proxy).launch
index 0f933e43f3d..e663bd0a04f 100755
--- a/java/com.sap.sailing.server/SailingServer (Proxy).launch	
+++ b/java/com.sap.sailing.server/SailingServer (Proxy).launch	
@@ -17,7 +17,7 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dexpedition.udp.port=2010 -Xmx1024m -Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true&#13;&#10;-Dexpedition.udp.port=2010 -Xmx1024m -Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="target_bundles" value="com.sap.ui5.commons@default:default,com.sap.ui5.core@default:default,com.sap.ui5.gwt.commons@default:default,com.sap.ui5.gwt.core@default:default,com.sap.ui5.resource.osgi@default:false,com.sap.ui5.resource@default:default,javax.servlet@default:default,jul.to.slf4j@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.nested@default:default,org.eclipse.jetty.osgi.boot@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,slf4j.api@default:default,slf4j.jdk14@default:false"/>
diff --git a/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch b/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
index ca957c86b32..54c16365be0 100755
--- a/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch	
+++ b/java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch	
@@ -19,7 +19,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/sapvm"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8888 -Xmx6000m -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Xmx6000m -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="target_bundles" value="javax.servlet@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit4@default:default"/>
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
index 69a579fc75e..7a9a14b1325 100644
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-maven-central.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.6"?>
 
-<target name="Race Analysis Target (Maven - central build)" sequenceNumber="24">
+<target name="Race Analysis Target (Maven - central build)" sequenceNumber="25">
 <locations>
 <location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.jetty.bundles.f.feature.group" version="7.5.4"/>
@@ -22,5 +22,9 @@
 <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.7.0.v20110506-0800-7uF9LFp7FWmE7gTBiKg15LDD"/>
 <repository location="http://download.eclipse.org/equinox/drops/R-3.7-201106131736/"/>
 </location>
+<location includeAllPlatforms="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rcp.source.feature.group" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A"/>
+<repository location="http://download.eclipse.org/releases/indigo"/>
+</location>
 </locations>
 </target>