Merge branch 'master' into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupFactory.java

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/util/impl/LockUtil.java

@@ -20,8 +20,6 @@ public class LockUtil {
      * dangerous, particularly if it happens in a <code>LiveLeaderboardUpdater</code> thread. Even though the bug is reported to
      * have been fixed in JDK 7(b79) we should be careful. This method tries to acquire a lock, allowing for five seconds to pass.
      * After five seconds and not having retrieved the lock, tries again until the lock has been acquired.
-     * @param lockParent TODO
-     * @throws InterruptedException 
      */
     private static void lock(Lock lock, String lockDescriptionForTimeoutLogMessage, NamedReentrantReadWriteLock lockParent) {
         boolean locked = false;