Conflicts:
java/com.sap.sailing.gwt.ui.test/.gitignore
java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.api/.project
java/com.sap.sailing.server.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java