Merge remote-tracking branch 'origin/master'

java/com.sap.sailing.simulator.test/.classpath

@@ -3,6 +3,8 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="resources"/>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/com.sap.sailing.gwt.ui"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

java/com.sap.sailing.simulator.test/build.properties

@@ -1,4 +1,6 @@
-source.. = src/
+source.. = src/,\
+           resources/
 output.. = bin/
 bin.includes = META-INF/,\
-               .
+               .,\
+               resources/