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.domain.test/META-INF/MANIFEST.MF

@@ -1,19 +1,19 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Test
-Bundle-SymbolicName: com.sap.sailing.domain.test
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: com.sap.sailing.domain,
- com.tractrac.clientmodule;bundle-version="2.0.0",
- com.sap.sailing.domain.tractracadapter,
- com.googlecode.java-diff-utils;bundle-version="1.3.0",
- com.sap.sailing.domain.common,
- com.sap.sailing.domain.shared.android
-Export-Package: com.sap.sailing.domain.test,
- com.sap.sailing.domain.test.mock
-Import-Package: junit.framework;version="4.8.1",
- org.json.simple,
- org.json.simple.parser,
- org.junit;version="4.8.1"
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: com.sap.sailing.domain.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: com.sap.sailing.domain,
+ com.tractrac.clientmodule;bundle-version="2.0.0",
+ com.sap.sailing.domain.tractracadapter,
+ com.googlecode.java-diff-utils;bundle-version="1.3.0",
+ com.sap.sailing.domain.common,
+ com.sap.sailing.domain.shared.android
+Export-Package: com.sap.sailing.domain.test,
+ com.sap.sailing.domain.test.mock
+Import-Package: junit.framework;version="4.8.1",
+ org.json.simple,
+ org.json.simple.parser,
+ org.junit;version="4.8.1"