Merge branch 'racecommittee_integrated' of

ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java

java/com.sap.sailing.www.events/WEB-INF/web.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://java.sun.com/xml/ns/javaee"
-	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
-
-    <servlet>
-    	<servlet-name>WinnerCircle2012Servlet</servlet-name>
-    	<servlet-class>com.sap.sailing.www.events.WinnerCircle2012Servlet</servlet-class>
-    </servlet>
-
-    <servlet-mapping>
-    	<servlet-name>WinnerCircle2012Servlet</servlet-name>
-    	<url-pattern>/winnercircle</url-pattern>
-    </servlet-mapping>
-
-</web-app>
-
+<?xml version="1.0" encoding="utf-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
+
+    <servlet>
+    	<servlet-name>WinnerCircle2012Servlet</servlet-name>
+    	<servlet-class>com.sap.sailing.www.events.WinnerCircle2012Servlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+    	<servlet-name>WinnerCircle2012Servlet</servlet-name>
+    	<url-pattern>/winnercircle</url-pattern>
+    </servlet-mapping>
+
+</web-app>
+