diff --git a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
index 4100b455215..2b84419e8ac 100644
--- a/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/AndroidManifest.xml
@@ -52,10 +52,6 @@
             android:name=".ui.activities.RacingActivity">
         </activity>
         
-        <activity 
-            android:name=".ui.activities.CourseDesigner">
-        </activity>
-        
         <activity android:name=".ui.activities.SettingsActivity"></activity>
         <service
             android:name="com.sap.sailing.racecommittee.app.services.RaceStateService"
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/course_designer.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_choose_classic_course_design_view.xml
similarity index 89%
rename from mobile/com.sap.sailing.racecommittee.app/res/layout/course_designer.xml
rename to mobile/com.sap.sailing.racecommittee.app/res/layout/race_choose_classic_course_design_view.xml
index e5ce0af9d02..d9644f28fb9 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/course_designer.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_choose_classic_course_design_view.xml
@@ -67,20 +67,14 @@
             android:orientation="vertical" >
         </LinearLayout>
 
-        <LinearLayout
+        <com.google.android.gms.maps.MapView
+            android:id="@+id/mapView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_margin="18dp"
             android:layout_marginRight="26dp"
-            android:orientation="vertical" >
-
-            <fragment
-                android:id="@+id/map"
-                android:name="com.google.android.gms.maps.MapFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-            </fragment>
-        </LinearLayout>
+            android:orientation="vertical"
+             />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_choose_course_design_view.xml b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_choose_ess_course_design_view.xml
similarity index 97%
rename from mobile/com.sap.sailing.racecommittee.app/res/layout/race_choose_course_design_view.xml
rename to mobile/com.sap.sailing.racecommittee.app/res/layout/race_choose_ess_course_design_view.xml
index 97643d9cc0e..322edd4cdea 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/layout/race_choose_course_design_view.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/layout/race_choose_ess_course_design_view.xml
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dslv="http://schemas.android.com/apk**/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:baselineAligned="false"
-    android:orientation="vertical" >
-    <LinearLayout 
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center_vertical|center_horizontal">
-        <TextView
-    	        android:text="@string/previous_course"
-    	        android:id="@+id/textPreviousCourse"
-    	        android:layout_width="300dp"
-    	        android:layout_height="wrap_content"
-            	android:layout_weight="1"
-            	android:textSize="14pt"
-            	android:textStyle="bold"
-            	android:gravity="center_vertical|center_horizontal"/>
-        <TextView
-    	        android:text="@string/make_new_course"
-    	        android:id="@+id/textMakeNewCourse"
-    	        android:layout_width="350dp"
-    	        android:layout_height="wrap_content"
-            	android:layout_weight="1"
-            	android:textSize="14pt"
-            	android:textStyle="bold"
-            	android:gravity="center_vertical|center_horizontal"/>
-        <TextView
-    	        android:text="@string/course_design_assets"
-    	        android:id="@+id/textCourseAssets"
-    	        android:layout_width="400dp"
-    	        android:layout_height="wrap_content"
-            	android:layout_weight="1"
-            	android:textSize="14pt"
-            	android:textStyle="bold"
-            	android:gravity="center_vertical|center_horizontal"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="500dp"
-        
-        android:gravity="center_vertical|center_horizontal"
-        android:orientation="horizontal" >
-
-        <ListView
-            android:id="@+id/listViewPreviousCourse"
-            android:layout_width="300dp"
-            android:layout_height="fill_parent"
-            android:layout_marginRight="20dp"
-            android:gravity="center_horizontal|center_vertical" />
-
-        <com.mobeta.android.dslv.DragSortListView
-            android:id="@+id/listViewNewCourse"
-            android:layout_width="350dp"
-            android:layout_height="fill_parent"
-            android:layout_gravity="left"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:gravity="center_horizontal|center_vertical"
-            android:verticalSpacing="5dp"
-            dslv:collapsed_height="2dp"
-            dslv:drag_enabled="true"
-            dslv:drag_scroll_start="0.33"
-            dslv:float_alpha="0.6"
-            dslv:max_drag_scroll_speed="0.5"
-            dslv:slide_shuffle_speed="0.3"
-            dslv:track_drag_sort="false"
-            dslv:use_default_controller="false" />
-
-        <GridView
-            android:id="@+id/gridViewAssets"
-            android:layout_width="400dp"
-            android:layout_height="fill_parent"
-            android:columnWidth="100dp"
-            android:gravity="center"
-            android:horizontalSpacing="10dp"
-            android:numColumns="auto_fit"
-            android:stretchMode="columnWidth"
-            android:verticalSpacing="10dp" />
-
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" 
-        android:paddingTop="20dp"
-        android:paddingBottom="10dp"
-        android:paddingLeft="20dp">
-
-        <Button
-            android:id="@+id/publishCourseDesignButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/publish"
-            android:textAppearance="@style/TextAppearance.Welter.BigTitleLabel"
-            android:layout_marginRight="20dp" />
-        <Button
-            android:id="@+id/unpublishCourseDesignButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/unpublish"
-            android:textAppearance="@style/TextAppearance.Welter.BigTitleLabel"
-            android:layout_marginRight="20dp" />
-        
-        <Button
-            android:id="@+id/takePreviousCourseDesignButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/take_previous"
-            android:textAppearance="@style/TextAppearance.Welter.BigTitleLabel" />
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dslv="http://schemas.android.com/apk**/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:baselineAligned="false"
+    android:orientation="vertical" >
+    <LinearLayout 
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical|center_horizontal">
+        <TextView
+    	        android:text="@string/previous_course"
+    	        android:id="@+id/textPreviousCourse"
+    	        android:layout_width="300dp"
+    	        android:layout_height="wrap_content"
+            	android:layout_weight="1"
+            	android:textSize="14pt"
+            	android:textStyle="bold"
+            	android:gravity="center_vertical|center_horizontal"/>
+        <TextView
+    	        android:text="@string/make_new_course"
+    	        android:id="@+id/textMakeNewCourse"
+    	        android:layout_width="350dp"
+    	        android:layout_height="wrap_content"
+            	android:layout_weight="1"
+            	android:textSize="14pt"
+            	android:textStyle="bold"
+            	android:gravity="center_vertical|center_horizontal"/>
+        <TextView
+    	        android:text="@string/course_design_assets"
+    	        android:id="@+id/textCourseAssets"
+    	        android:layout_width="400dp"
+    	        android:layout_height="wrap_content"
+            	android:layout_weight="1"
+            	android:textSize="14pt"
+            	android:textStyle="bold"
+            	android:gravity="center_vertical|center_horizontal"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="500dp"
+        
+        android:gravity="center_vertical|center_horizontal"
+        android:orientation="horizontal" >
+
+        <ListView
+            android:id="@+id/listViewPreviousCourse"
+            android:layout_width="300dp"
+            android:layout_height="fill_parent"
+            android:layout_marginRight="20dp"
+            android:gravity="center_horizontal|center_vertical" />
+
+        <com.mobeta.android.dslv.DragSortListView
+            android:id="@+id/listViewNewCourse"
+            android:layout_width="350dp"
+            android:layout_height="fill_parent"
+            android:layout_gravity="left"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:gravity="center_horizontal|center_vertical"
+            android:verticalSpacing="5dp"
+            dslv:collapsed_height="2dp"
+            dslv:drag_enabled="true"
+            dslv:drag_scroll_start="0.33"
+            dslv:float_alpha="0.6"
+            dslv:max_drag_scroll_speed="0.5"
+            dslv:slide_shuffle_speed="0.3"
+            dslv:track_drag_sort="false"
+            dslv:use_default_controller="false" />
+
+        <GridView
+            android:id="@+id/gridViewAssets"
+            android:layout_width="400dp"
+            android:layout_height="fill_parent"
+            android:columnWidth="100dp"
+            android:gravity="center"
+            android:horizontalSpacing="10dp"
+            android:numColumns="auto_fit"
+            android:stretchMode="columnWidth"
+            android:verticalSpacing="10dp" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" 
+        android:paddingTop="20dp"
+        android:paddingBottom="10dp"
+        android:paddingLeft="20dp">
+
+        <Button
+            android:id="@+id/publishCourseDesignButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/publish"
+            android:textAppearance="@style/TextAppearance.Welter.BigTitleLabel"
+            android:layout_marginRight="20dp" />
+        <Button
+            android:id="@+id/unpublishCourseDesignButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/unpublish"
+            android:textAppearance="@style/TextAppearance.Welter.BigTitleLabel"
+            android:layout_marginRight="20dp" />
+        
+        <Button
+            android:id="@+id/takePreviousCourseDesignButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/take_previous"
+            android:textAppearance="@style/TextAppearance.Welter.BigTitleLabel" />
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/themes.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/themes.xml
index 82fa9720515..41fce95582b 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/themes.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/themes.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
+     <style name="Theme.DimDisabledDialog" parent="Theme.Welter">
+         <item name="android:backgroundDimEnabled">false</item>
+     </style>
+
     <style name="Theme.Welter" parent="android:Theme.Holo.Light">
         <item name="android:actionBarStyle">@style/Widget.ActionBar</item>
-         
         <item name="android:textColorPrimary">@color/welter_deep_gray</item>
-                
+        
         <!-- 
         <item name="timePickerStyle">@style/Widget.TimePicker</item>
         -->
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/StartProcedure.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/StartProcedure.java
index 3a48edc71ca..ce48cf5e388 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/StartProcedure.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/StartProcedure.java
@@ -59,4 +59,6 @@ public interface StartProcedure {
 
     List<Class<? extends RaceDialogFragment>> checkForUserActionRequiredActions(MillisecondsTimePoint newStartTime, UserRequiredActionPerformedListener listener);
 
+    Class<? extends RaceDialogFragment> getCourseDesignDialog();
+
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/ExtremeSailingSeriesStartProcedure.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/ExtremeSailingSeriesStartProcedure.java
index 8659b4a2ed2..6e811044fb6 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/ExtremeSailingSeriesStartProcedure.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/ExtremeSailingSeriesStartProcedure.java
@@ -26,6 +26,7 @@ import com.sap.sailing.racecommittee.app.domain.startprocedure.StartProcedure;
 import com.sap.sailing.racecommittee.app.domain.startprocedure.StartProcedureListener;
 import com.sap.sailing.racecommittee.app.domain.startprocedure.UserRequiredActionPerformedListener;
 import com.sap.sailing.racecommittee.app.ui.fragments.RaceFragment;
+import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.ESSCourseDesignDialogFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.RaceDialogFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.EssRunningRaceFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.FinishedRaceFragment;
@@ -400,4 +401,9 @@ public class ExtremeSailingSeriesStartProcedure implements StartProcedure {
     public List<Class<? extends RaceDialogFragment>> checkForUserActionRequiredActions(MillisecondsTimePoint newStartTime, UserRequiredActionPerformedListener listener) {
         return new ArrayList<Class<? extends RaceDialogFragment>>();
     }
+
+    @Override
+    public Class<? extends RaceDialogFragment> getCourseDesignDialog() {
+        return ESSCourseDesignDialogFragment.class;
+    }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/GateStartProcedure.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/GateStartProcedure.java
index cc1b334e55f..a92daf67d39 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/GateStartProcedure.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/GateStartProcedure.java
@@ -22,6 +22,7 @@ import com.sap.sailing.racecommittee.app.domain.startprocedure.StartProcedure;
 import com.sap.sailing.racecommittee.app.domain.startprocedure.StartProcedureListener;
 import com.sap.sailing.racecommittee.app.domain.startprocedure.UserRequiredActionPerformedListener;
 import com.sap.sailing.racecommittee.app.ui.fragments.RaceFragment;
+import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.ClassicCourseDesignDialogFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.RaceDialogFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.FinishedRaceFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.FinishingRaceFragment;
@@ -329,4 +330,9 @@ public class GateStartProcedure implements StartProcedure {
     public List<Class<? extends RaceDialogFragment>> checkForUserActionRequiredActions(MillisecondsTimePoint newStartTime, UserRequiredActionPerformedListener listener) {
         return new ArrayList<Class<? extends RaceDialogFragment>>();
     }
+    
+    @Override
+    public Class<? extends RaceDialogFragment> getCourseDesignDialog() {
+        return ClassicCourseDesignDialogFragment.class;
+    }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/RRS26StartProcedure.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/RRS26StartProcedure.java
index 75f8d3f3741..428f5491202 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/RRS26StartProcedure.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/startprocedure/impl/RRS26StartProcedure.java
@@ -26,6 +26,7 @@ import com.sap.sailing.racecommittee.app.domain.startprocedure.StartProcedure;
 import com.sap.sailing.racecommittee.app.domain.startprocedure.StartProcedureListener;
 import com.sap.sailing.racecommittee.app.domain.startprocedure.UserRequiredActionPerformedListener;
 import com.sap.sailing.racecommittee.app.ui.fragments.RaceFragment;
+import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.ClassicCourseDesignDialogFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.RaceChooseStartModeDialog;
 import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.RaceDialogFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RRS26FinishedRaceFragment;
@@ -419,4 +420,9 @@ public class RRS26StartProcedure implements StartProcedure, StartModeChoosableSt
         }
         return actionList;
     }
+    
+    @Override
+    public Class<? extends RaceDialogFragment> getCourseDesignDialog() {
+        return ClassicCourseDesignDialogFragment.class;
+    }
 }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/CourseDesigner.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/CourseDesigner.java
deleted file mode 100644
index 3795fc1b274..00000000000
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/CourseDesigner.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.sap.sailing.racecommittee.app.ui.activities;
-
-import android.os.Bundle;
-
-import com.google.android.gms.maps.GoogleMap;
-import com.google.android.gms.maps.MapFragment;
-import com.sap.sailing.racecommittee.app.R;
-
-public class CourseDesigner extends BaseActivity {
-
-	@SuppressWarnings("unused")
-    private GoogleMap courseAreaMap;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.course_designer);
-
-
-		courseAreaMap = ((MapFragment) getFragmentManager().findFragmentById(
-				R.id.map)).getMap();
-	}
-}
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceInfoFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceInfoFragment.java
index b9adba5e406..81c42cbf49f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceInfoFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/RaceInfoFragment.java
@@ -1,10 +1,11 @@
 package com.sap.sailing.racecommittee.app.ui.fragments;
 
 import android.app.AlertDialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,8 +22,8 @@ import com.sap.sailing.racecommittee.app.domain.ManagedRace;
 import com.sap.sailing.racecommittee.app.domain.state.RaceState;
 import com.sap.sailing.racecommittee.app.domain.state.RaceStateChangedListener;
 import com.sap.sailing.racecommittee.app.logging.ExLog;
-import com.sap.sailing.racecommittee.app.ui.activities.CourseDesigner;
 import com.sap.sailing.racecommittee.app.ui.fragments.chooser.RaceInfoFragmentChooser;
+import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.RaceDialogFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceInfoListener;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.SetStartTimeRaceFragment;
 
@@ -134,16 +135,25 @@ public class RaceInfoFragment extends RaceFragment implements RaceStateChangedLi
     }
 
     private void showCourseDesignDialog() {
-        Intent message = new Intent(this.getActivity(), CourseDesigner.class);
-        startActivity(message);
-        /*FragmentManager fragmentManager = getFragmentManager();
+        FragmentManager fragmentManager = getFragmentManager();
 
-        RaceDialogFragment fragment = new CourseDesignDialogFragment();
-
-        Bundle args = getRecentArguments();
-        fragment.setArguments(args);
-
-        fragment.show(fragmentManager, "courseDesignDialogFragment");*/
+        RaceDialogFragment fragment;
+        try {
+            fragment = getRace().getState().getStartProcedure().getCourseDesignDialog().newInstance();
+            Bundle args = getRecentArguments();
+            fragment.setArguments(args);
+            
+            //handle map bug - https://code.google.com/p/gmaps-api-issues/issues/detail?id=4865
+            fragment.setStyle(DialogFragment.STYLE_NORMAL, R.style.Theme_DimDisabledDialog);
+            
+            fragment.show(fragmentManager, "courseDesignDialogFragment");
+        } catch (java.lang.InstantiationException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
     }
 
     @Override
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ClassicCourseDesignDialogFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ClassicCourseDesignDialogFragment.java
new file mode 100644
index 00000000000..b37fe732200
--- /dev/null
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ClassicCourseDesignDialogFragment.java
@@ -0,0 +1,139 @@
+package com.sap.sailing.racecommittee.app.ui.fragments.dialogs;
+
+import android.app.DialogFragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.MapView;
+import com.google.android.gms.maps.MapsInitializer;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
+import com.sap.sailing.racecommittee.app.R;
+
+
+public class ClassicCourseDesignDialogFragment extends RaceDialogFragment {
+    private MapView mMapView;
+    private GoogleMap mMap;
+    private Bundle mBundle;
+    
+    @SuppressWarnings("unused")
+    private final static String TAG = ClassicCourseDesignDialogFragment.class.getName();
+
+    protected CourseDesignListener hostActivity;
+    
+    private Button publishButton;
+    private Button unpublishButton;
+    @SuppressWarnings("unused")
+    private GoogleMap courseAreaMap;
+    
+    @Override
+    public void onAttach(android.app.Activity activity) {
+        super.onAttach(activity);
+
+        if (activity instanceof CourseDesignListener) {
+            this.hostActivity = (CourseDesignListener) activity;
+        } else {
+            throw new IllegalStateException(
+                    String.format(
+                            "Instance of %s must be attached to instances of %s. Tried to attach to %s.",
+                            ActivityDialogFragment.class.getName(),
+                            CourseDesignListener.class.getName(),
+                            activity.getClass().getName()));
+        }
+    };
+
+    protected CourseDesignListener getHost() {
+        return this.hostActivity;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        //Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.race_choose_classic_course_design_view, container);
+        try {
+            MapsInitializer.initialize(getActivity());
+        } catch (GooglePlayServicesNotAvailableException e) {
+            // TODO handle this situation
+        }
+
+        mMapView = (MapView) view.findViewById(R.id.mapView);
+        mMapView.onCreate(mBundle);
+        setUpMapIfNeeded(view);
+        
+        return view;
+
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        getDialog().setTitle(getActivity().getText(R.string.course_design_dialog_title));
+        
+        
+        publishButton = (Button) getView().findViewById(R.id.publishCourseDesignButton);
+        publishButton.setOnClickListener(new OnClickListener() {
+
+            public void onClick(View arg0) {
+            }
+
+        });
+
+        unpublishButton = (Button) getView().findViewById(R.id.unpublishCourseDesignButton);
+        unpublishButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View arg0) {
+            }
+
+        });
+    }
+    
+    @Override
+    public void onResume() {
+        super.onResume();
+        mMapView.onResume();
+    }
+    
+    @Override
+    public void notifyTick() {
+        
+    }
+    
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mBundle = savedInstanceState;
+    }
+
+    private void setUpMapIfNeeded(View inflatedView) {
+        if (mMap == null) {
+            mMap = ((MapView) inflatedView.findViewById(R.id.mapView)).getMap();
+            if (mMap != null) {
+                setUpMap();
+            }
+        }
+    }
+
+    private void setUpMap() {
+        mMap.addMarker(new MarkerOptions().position(new LatLng(0, 0)).title("Marker"));
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mMapView.onPause();
+    }
+
+    @Override
+    public void onDestroy() {
+        mMapView.onDestroy();
+        super.onDestroy();
+    }
+
+}
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/CourseDesignDialogFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ESSCourseDesignDialogFragment.java
similarity index 96%
rename from mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/CourseDesignDialogFragment.java
rename to mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ESSCourseDesignDialogFragment.java
index ae544e5fac3..033bccd00cb 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/CourseDesignDialogFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ESSCourseDesignDialogFragment.java
@@ -1,507 +1,507 @@
-package com.sap.sailing.racecommittee.app.ui.fragments.dialogs;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.Button;
-import android.widget.GridView;
-import android.widget.ListView;
-import android.widget.Toast;
-
-import com.mobeta.android.dslv.DragSortController;
-import com.mobeta.android.dslv.DragSortListView;
-import com.sap.sailing.domain.base.ControlPoint;
-import com.sap.sailing.domain.base.CourseBase;
-import com.sap.sailing.domain.base.Gate;
-import com.sap.sailing.domain.base.Mark;
-import com.sap.sailing.domain.base.Waypoint;
-import com.sap.sailing.domain.base.impl.CourseDataImpl;
-import com.sap.sailing.domain.base.impl.GateImpl;
-import com.sap.sailing.domain.base.impl.WaypointImpl;
-import com.sap.sailing.domain.common.NauticalSide;
-import com.sap.sailing.domain.common.impl.Util;
-import com.sap.sailing.racecommittee.app.R;
-import com.sap.sailing.racecommittee.app.data.InMemoryDataStore;
-import com.sap.sailing.racecommittee.app.data.clients.LoadClient;
-import com.sap.sailing.racecommittee.app.domain.RoundingDirection;
-import com.sap.sailing.racecommittee.app.logging.ExLog;
-import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseElementListAdapter;
-import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.DraggableCourseElementListAdapter;
-import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseListDataElement;
-import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.MarkGridAdapter;
-import com.sap.sailing.racecommittee.app.ui.comparators.NamedComparator;
-
-public class CourseDesignDialogFragment extends RaceDialogFragment {
-    private final static String TAG = CourseDesignDialogFragment.class.getName();
-
-    protected CourseDesignListener hostActivity;
-    private List<Mark> aMarkList;
-    private MarkGridAdapter gridAdapter;
-    private List<CourseListDataElement> courseElements;
-    private List<CourseListDataElement> previousCourseElements;
-    private DraggableCourseElementListAdapter courseElementAdapter;
-    private CourseElementListAdapter previousCourseElementAdapter;
-    private DragSortListView newCourseListView;
-    private ListView previousCourseListView;
-    
-    private DragSortController dragSortController;
-    
-    private Button publishButton;
-    private Button unpublishButton;
-    private Button takePreviousButton;
-    
-    private int dragStartMode = DragSortController.ON_DRAG;
-    private boolean removeEnabled = true;
-    private int removeMode = DragSortController.FLING_REMOVE;
-    private boolean sortEnabled = true;
-    private boolean dragEnabled = true;
-
-    @Override
-    public void onAttach(android.app.Activity activity) {
-        super.onAttach(activity);
-
-        if (activity instanceof CourseDesignListener) {
-            this.hostActivity = (CourseDesignListener) activity;
-        } else {
-            throw new IllegalStateException(
-                    String.format(
-                            "Instance of %s must be attached to instances of %s. Tried to attach to %s.",
-                            ActivityDialogFragment.class.getName(),
-                            CourseDesignListener.class.getName(),
-                            activity.getClass().getName()));
-        }
-    };
-
-    protected CourseDesignListener getHost() {
-        return this.hostActivity;
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        //Inflate the layout for this fragment
-        View view = inflater.inflate(R.layout.race_choose_course_design_view, container);
-
-        return view;
-
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        getDialog().setTitle(getActivity().getText(R.string.course_design_dialog_title));
-
-        aMarkList  = new ArrayList<Mark>();
-        courseElements = new ArrayList<CourseListDataElement>();
-        previousCourseElements = new ArrayList<CourseListDataElement>();
-
-        gridAdapter = new MarkGridAdapter(getActivity(), aMarkList);
-        courseElementAdapter = new DraggableCourseElementListAdapter(getActivity(), courseElements);
-        previousCourseElementAdapter = new CourseElementListAdapter(getActivity(), previousCourseElements);
-        
-        loadMarks();
-        loadCourseOnServer();
-
-        GridView gridView = (GridView) getView().findViewById(R.id.gridViewAssets);
-        gridView.setAdapter(gridAdapter);
-
-        gridView.setOnItemClickListener(new OnItemClickListener() {
-
-            public void onItemClick(AdapterView<?> arg0, View view, int position, long arg3) {
-                Mark mark = (Mark) gridAdapter.getItem(position);
-                Log.i("CourseDesign", "Grid is clicked at position " + position + " for buoy " + mark.getName());
-                onMarkClickedOnGrid(mark);
-            }
-
-        });
-        
-        newCourseListView = (DragSortListView) getView().findViewById(R.id.listViewNewCourse);
-        newCourseListView.setAdapter(courseElementAdapter);
-        newCourseListView.setDropListener(new DragSortListView.DropListener() {
-
-            @Override
-            public void drop(int from, int to) {
-                if (from != to) {
-                    CourseListDataElement item = courseElementAdapter.getItem(from);
-                    courseElementAdapter.remove(item);
-                    courseElementAdapter.insert(item, to);
-                }
-            }
-        });
-        
-        newCourseListView.setRemoveListener(new DragSortListView.RemoveListener() {
-            
-            @Override
-            public void remove(int toBeRemoved) {
-                CourseListDataElement item = courseElementAdapter.getItem(toBeRemoved);
-                courseElementAdapter.remove(item);
-            }
-        });
-        
-        newCourseListView.setOnItemLongClickListener(new OnItemLongClickListener() {
-
-            @Override
-            public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int position, long arg3) {
-                CourseListDataElement courseElement = courseElementAdapter.getItem(position);
-                createRoundingDirectionDialog(courseElement);
-                return true;
-            }
-        });
-        
-        dragSortController = buildDragSortController(newCourseListView);
-        newCourseListView.setFloatViewManager(dragSortController);
-        newCourseListView.setOnTouchListener(dragSortController);
-        newCourseListView.setDragEnabled(dragEnabled);
-
-        if (getRace().getCourseDesign() != null) {
-            fillCourseElementsInList();
-        }
-
-        previousCourseListView = (ListView) getView().findViewById(R.id.listViewPreviousCourse);
-        previousCourseListView.setAdapter(previousCourseElementAdapter);
-
-        takePreviousButton = (Button) getView().findViewById(R.id.takePreviousCourseDesignButton);
-        takePreviousButton.setOnClickListener(new OnClickListener() {
-
-            public void onClick(View arg0) {
-                if (!previousCourseElements.isEmpty()) {
-                    if (!courseElements.isEmpty()) {
-                        createUsePreviousCourseDialog();
-                    } else {
-                        copyPreviousToNewCourseDesign();
-                    }
-                }
-                else {
-                    Toast.makeText(getActivity(), "No course available to copy", Toast.LENGTH_LONG).show();
-                }
-            }
-        });
-
-
-        publishButton = (Button) getView().findViewById(R.id.publishCourseDesignButton);
-        publishButton.setOnClickListener(new OnClickListener() {
-
-            public void onClick(View arg0) {
-                try {
-                    CourseBase courseData = convertCourseElementsToACourseData();
-                    sendCourseDataAndDismiss(courseData);
-                } catch (IllegalStateException ex) {
-                    if (ex.getMessage().equals("Gate has no right buoy")) {
-                        Toast.makeText(getActivity(), "A right buoy is missing for a gate. Please select the right buoy.", Toast.LENGTH_LONG).show();
-                    } else if (ex.getMessage().equals("Each waypoints needs a passing side")) {
-                        Toast.makeText(getActivity(), "A waypoint has no passing side. Please select the passing side by clicking long on the waypoint.", Toast.LENGTH_LONG).show();
-                    }
-                    
-                } catch (IllegalArgumentException ex) {
-                    Toast.makeText(getActivity(), "The course design has to have at least one waypoint.", Toast.LENGTH_LONG).show();
-                }
-            }
-
-        });
-
-        unpublishButton = (Button) getView().findViewById(R.id.unpublishCourseDesignButton);
-        unpublishButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View arg0) {
-                CourseBase emptyCourse = new CourseDataImpl("Unpublished course design");
-                sendCourseDataAndDismiss(emptyCourse);
-            }
-
-        });
-
-    }
-    
-    /**
-     * Creates a DragSortController and thereby defines the behaviour of the drag sort list
-     */
-    public DragSortController buildDragSortController(DragSortListView dragSortListView) {
-        DragSortController controller = new DragSortController(dragSortListView);
-        controller.setDragHandleId(R.id.drag_handle);
-        controller.setFlingHandleId(R.id.drag_handle);
-        controller.setRemoveEnabled(removeEnabled);
-        controller.setSortEnabled(sortEnabled);
-        controller.setDragInitMode(dragStartMode);
-        controller.setRemoveMode(removeMode);
-        controller.setBackgroundColor(getActivity().getResources().getColor(R.color.welter_medium_blue));
-        return controller;
-    }
-    
-    @Override
-    public void onResume() {
-        super.onResume();
-        onLoadMarksSucceeded(hostActivity.getDataManager().getDataStore().getMarks());
-    }
-    
-    private void loadCourseOnServer() {
-        hostActivity.getDataManager().loadCourse(getRace(), new LoadClient<CourseBase>() {
-
-            @Override
-            public void onLoadFailed(Exception reason) {
-                fillPreviousCourseElementsWithLastPublishedCourseDesign();
-            }
-
-            @Override
-            public void onLoadSucceded(CourseBase data) {
-                /*if (Util.size(data.getWaypoints()) > 0) {
-                    fillPreviousCourseElementsInList(data);
-                } else*/ {
-                    fillPreviousCourseElementsWithLastPublishedCourseDesign();
-                }
-                
-            }
-            
-        });
-    }
-    
-    private void fillPreviousCourseElementsWithLastPublishedCourseDesign() {
-        CourseBase lastPublishedCourseDesign = InMemoryDataStore.INSTANCE.getLastPublishedCourseDesign();
-        if(lastPublishedCourseDesign != null) {
-            fillPreviousCourseElementsInList(lastPublishedCourseDesign);
-        }
-    }
-
-    private void loadMarks() {
-        hostActivity.getDataManager().loadMarks(getRace(), new LoadClient<Collection<Mark>>() {
-
-            @Override
-            public void onLoadFailed(Exception reason) {
-            }
-
-            @Override
-            public void onLoadSucceded(Collection<Mark> data) {
-                onLoadMarksSucceeded(data);
-            }
-            
-        });
-    }
-
-    protected void onLoadMarksSucceeded(Collection<Mark> data) {
-        aMarkList.clear();
-        aMarkList.addAll(data);
-        Collections.sort(aMarkList, new NamedComparator());
-        gridAdapter.notifyDataSetChanged();
-    }
-
-    private void fillPreviousCourseElementsInList(CourseBase previousCourseData) {
-        if (previousCourseData != null) {
-            previousCourseElements.clear();
-            previousCourseElements.addAll(convertCourseDesignToCourseElements(previousCourseData));
-            previousCourseElementAdapter.notifyDataSetChanged();
-        }
-    }
-
-    private void fillCourseElementsInList() {
-        courseElements.clear();
-        courseElements.addAll(convertCourseDesignToCourseElements(getRace().getCourseDesign()));
-        courseElementAdapter.notifyDataSetChanged();
-    }
-
-    protected List<CourseListDataElement> convertCourseDesignToCourseElements(CourseBase courseData) {
-        List<CourseListDataElement> elementList = new ArrayList<CourseListDataElement>();
-
-        for (Waypoint waypoint : courseData.getWaypoints()) {
-            ControlPoint controlPoint = waypoint.getControlPoint();
-            
-            if (controlPoint instanceof Mark) {
-                CourseListDataElement element = new CourseListDataElement();
-                element.setLeftMark((Mark)controlPoint);
-                element.setRoundingDirection(getRoundingDirection(waypoint.getPassingSide()));
-                elementList.add(element);
-            } else if (controlPoint instanceof Gate) {
-                Gate gate = (Gate) controlPoint;
-                CourseListDataElement element = new CourseListDataElement();
-                element.setLeftMark(gate.getLeft());
-                element.setRightMark(gate.getRight());
-                element.setRoundingDirection(RoundingDirection.Gate);
-                elementList.add(element);
-            }
-        }
-
-        return elementList;
-    }
-
-    protected void sendCourseDataAndDismiss(CourseBase courseDesign) {
-        sendCourseData(courseDesign);
-        onPublish();
-        dismiss();
-    }
-
-    protected void sendCourseData(CourseBase courseDesign) {
-        getRace().getState().setCourseDesign(courseDesign);
-        saveChangedCourseDesignInCache(courseDesign);
-    }
-
-    private void saveChangedCourseDesignInCache(CourseBase courseDesign) {
-        if (!Util.isEmpty(courseDesign.getWaypoints())) {
-            InMemoryDataStore.INSTANCE.setLastPublishedCourseDesign(courseDesign);
-        }
-    }
-
-    protected CourseBase convertCourseElementsToACourseData() throws IllegalStateException, IllegalArgumentException {
-        CourseBase design = new CourseDataImpl("CourseTemplate");
-        List<Waypoint> waypoints = new ArrayList<Waypoint>();
-
-        for (CourseListDataElement courseElement : courseElements) {
-            if (courseElement.getRoundingDirection().equals(RoundingDirection.Gate) && courseElement.getRightMark() != null) {
-                String gateName = "Gate " + courseElement.getLeftMark().getName() + " / " + courseElement.getRightMark().getName();
-                Gate gate = new GateImpl(courseElement.getLeftMark(), courseElement.getRightMark(), gateName);
-                Waypoint waypoint = new WaypointImpl(gate);
-                
-                waypoints.add(waypoint);
-            } else if (courseElement.getRoundingDirection().equals(RoundingDirection.Gate) && courseElement.getRightMark() == null) {
-                throw new IllegalStateException("Gate has no right buoy");
-            } else if (courseElement.getRoundingDirection().equals(RoundingDirection.None)) {
-                throw new IllegalStateException("Each waypoints needs a passing side");
-            } else {
-                Waypoint waypoint = new WaypointImpl(courseElement.getLeftMark(), getNauticalSide(courseElement.getRoundingDirection()));
-                
-                waypoints.add(waypoint);
-            }
-
-        }
-        if (waypoints.isEmpty()) {
-            throw new IllegalArgumentException("The course design to be published has no waypoints.");
-        }
-
-        int i = 0;
-        for (Waypoint waypoint : waypoints) {
-            design.addWaypoint(i++, waypoint);
-        }
-
-        return design;
-    }
-
-    private NauticalSide getNauticalSide(RoundingDirection roundingDirection) {
-        NauticalSide side = null;
-        if (roundingDirection.name().equalsIgnoreCase(NauticalSide.PORT.name())) {
-            side = NauticalSide.PORT;
-        } else if (roundingDirection.name().equalsIgnoreCase(NauticalSide.STARBOARD.name())){
-            side = NauticalSide.STARBOARD;
-        }
-        return side;
-    }
-    
-    private RoundingDirection getRoundingDirection(NauticalSide passingSide) {
-        RoundingDirection direction = null;
-        if (passingSide == null) {
-            direction = RoundingDirection.None;
-        } else if (passingSide.name().equalsIgnoreCase(RoundingDirection.Port.name())) {
-            direction = RoundingDirection.Port;
-        } else if (passingSide.name().equalsIgnoreCase(RoundingDirection.Starboard.name())){
-            direction = RoundingDirection.Starboard;
-        } else {
-            direction = RoundingDirection.Gate;
-        }
-        return direction;
-    }
-
-    private void createUsePreviousCourseDialog() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle("Use previous course design");
-        builder.setMessage("Use previously published course design?");
-        builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                copyPreviousToNewCourseDesign();
-            }
-        });
-        builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
-
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                //do nothing
-            }
-        });
-        builder.create();
-        builder.show();
-    }
-    
-    protected void copyPreviousToNewCourseDesign() {
-        courseElements.clear();
-        courseElements.addAll(previousCourseElements);
-        courseElementAdapter.notifyDataSetChanged();
-}
-
-    protected void onMarkClickedOnGrid(Mark mark) {
-        if (courseElements.isEmpty()) {
-            addNewCourseElementToList(mark);
-        } else {
-            CourseListDataElement gateCourseElement = getFirstGateCourseElementWithoutRightMark();
-            if (gateCourseElement != null) {
-                gateCourseElement.setRightMark(mark);
-                courseElementAdapter.notifyDataSetChanged();
-            } else {
-                addNewCourseElementToList(mark);
-            }
-        }
-    }
-    
-    private CourseListDataElement getFirstGateCourseElementWithoutRightMark() {
-        for (CourseListDataElement courseElement : courseElements) {
-            if (courseElement.getRoundingDirection().equals(RoundingDirection.Gate) && courseElement.getRightMark() == null) {
-                return courseElement;
-            }
-        }
-        return null;
-    }
-
-    private void addNewCourseElementToList(Mark mark) {
-        CourseListDataElement courseElement = new CourseListDataElement();
-        courseElement.setLeftMark(mark);
-        createRoundingDirectionDialog(courseElement);
-    }
-
-    private void createRoundingDirectionDialog(final CourseListDataElement courseElement) {
-        List<String> directions = new ArrayList<String>();
-        for (RoundingDirection direction : RoundingDirection.relevantValues()) {
-            directions.add(direction.name());
-        }
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setTitle(R.string.pick_a_rounding_direction)
-        .setItems(R.array.rounding_directions, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int position) {
-                String[] directions = getActivity().getResources().getStringArray(R.array.rounding_directions);
-                RoundingDirection pickedDirection = RoundingDirection.valueOf(directions[position]);
-                onRoundingDirectionPicked(courseElement, pickedDirection);
-            }
-        });
-        builder.create();
-        builder.show();
-    }
-
-    protected void onRoundingDirectionPicked(CourseListDataElement courseElement, RoundingDirection pickedDirection) {
-        courseElement.setRoundingDirection(pickedDirection);
-        if (!courseElements.contains(courseElement)) {
-            courseElements.add(courseElement);
-        }
-        courseElementAdapter.notifyDataSetChanged();
-    }
-
-    protected void onPublish() {
-        if (getHost() != null) {
-            getHost().onCourseDesignPublish();
-        } else {
-            ExLog.w(TAG, "Dialog host was null.");
-        }
-    }
-
-    @Override
-    public void notifyTick() {
-        
-    }
-
-}
+package com.sap.sailing.racecommittee.app.ui.fragments.dialogs;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.AdapterView.OnItemLongClickListener;
+import android.widget.Button;
+import android.widget.GridView;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import com.mobeta.android.dslv.DragSortController;
+import com.mobeta.android.dslv.DragSortListView;
+import com.sap.sailing.domain.base.ControlPoint;
+import com.sap.sailing.domain.base.CourseBase;
+import com.sap.sailing.domain.base.Gate;
+import com.sap.sailing.domain.base.Mark;
+import com.sap.sailing.domain.base.Waypoint;
+import com.sap.sailing.domain.base.impl.CourseDataImpl;
+import com.sap.sailing.domain.base.impl.GateImpl;
+import com.sap.sailing.domain.base.impl.WaypointImpl;
+import com.sap.sailing.domain.common.NauticalSide;
+import com.sap.sailing.domain.common.impl.Util;
+import com.sap.sailing.racecommittee.app.R;
+import com.sap.sailing.racecommittee.app.data.InMemoryDataStore;
+import com.sap.sailing.racecommittee.app.data.clients.LoadClient;
+import com.sap.sailing.racecommittee.app.domain.RoundingDirection;
+import com.sap.sailing.racecommittee.app.logging.ExLog;
+import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseElementListAdapter;
+import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.DraggableCourseElementListAdapter;
+import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.CourseListDataElement;
+import com.sap.sailing.racecommittee.app.ui.adapters.coursedesign.MarkGridAdapter;
+import com.sap.sailing.racecommittee.app.ui.comparators.NamedComparator;
+
+public class ESSCourseDesignDialogFragment extends RaceDialogFragment {
+    private final static String TAG = ESSCourseDesignDialogFragment.class.getName();
+
+    protected CourseDesignListener hostActivity;
+    private List<Mark> aMarkList;
+    private MarkGridAdapter gridAdapter;
+    private List<CourseListDataElement> courseElements;
+    private List<CourseListDataElement> previousCourseElements;
+    private DraggableCourseElementListAdapter courseElementAdapter;
+    private CourseElementListAdapter previousCourseElementAdapter;
+    private DragSortListView newCourseListView;
+    private ListView previousCourseListView;
+    
+    private DragSortController dragSortController;
+    
+    private Button publishButton;
+    private Button unpublishButton;
+    private Button takePreviousButton;
+    
+    private int dragStartMode = DragSortController.ON_DRAG;
+    private boolean removeEnabled = true;
+    private int removeMode = DragSortController.FLING_REMOVE;
+    private boolean sortEnabled = true;
+    private boolean dragEnabled = true;
+
+    @Override
+    public void onAttach(android.app.Activity activity) {
+        super.onAttach(activity);
+
+        if (activity instanceof CourseDesignListener) {
+            this.hostActivity = (CourseDesignListener) activity;
+        } else {
+            throw new IllegalStateException(
+                    String.format(
+                            "Instance of %s must be attached to instances of %s. Tried to attach to %s.",
+                            ActivityDialogFragment.class.getName(),
+                            CourseDesignListener.class.getName(),
+                            activity.getClass().getName()));
+        }
+    };
+
+    protected CourseDesignListener getHost() {
+        return this.hostActivity;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        //Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.race_choose_ess_course_design_view, container);
+
+        return view;
+
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        getDialog().setTitle(getActivity().getText(R.string.course_design_dialog_title));
+
+        aMarkList  = new ArrayList<Mark>();
+        courseElements = new ArrayList<CourseListDataElement>();
+        previousCourseElements = new ArrayList<CourseListDataElement>();
+
+        gridAdapter = new MarkGridAdapter(getActivity(), aMarkList);
+        courseElementAdapter = new DraggableCourseElementListAdapter(getActivity(), courseElements);
+        previousCourseElementAdapter = new CourseElementListAdapter(getActivity(), previousCourseElements);
+        
+        loadMarks();
+        loadCourseOnServer();
+
+        GridView gridView = (GridView) getView().findViewById(R.id.gridViewAssets);
+        gridView.setAdapter(gridAdapter);
+
+        gridView.setOnItemClickListener(new OnItemClickListener() {
+
+            public void onItemClick(AdapterView<?> arg0, View view, int position, long arg3) {
+                Mark mark = (Mark) gridAdapter.getItem(position);
+                Log.i("CourseDesign", "Grid is clicked at position " + position + " for buoy " + mark.getName());
+                onMarkClickedOnGrid(mark);
+            }
+
+        });
+        
+        newCourseListView = (DragSortListView) getView().findViewById(R.id.listViewNewCourse);
+        newCourseListView.setAdapter(courseElementAdapter);
+        newCourseListView.setDropListener(new DragSortListView.DropListener() {
+
+            @Override
+            public void drop(int from, int to) {
+                if (from != to) {
+                    CourseListDataElement item = courseElementAdapter.getItem(from);
+                    courseElementAdapter.remove(item);
+                    courseElementAdapter.insert(item, to);
+                }
+            }
+        });
+        
+        newCourseListView.setRemoveListener(new DragSortListView.RemoveListener() {
+            
+            @Override
+            public void remove(int toBeRemoved) {
+                CourseListDataElement item = courseElementAdapter.getItem(toBeRemoved);
+                courseElementAdapter.remove(item);
+            }
+        });
+        
+        newCourseListView.setOnItemLongClickListener(new OnItemLongClickListener() {
+
+            @Override
+            public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int position, long arg3) {
+                CourseListDataElement courseElement = courseElementAdapter.getItem(position);
+                createRoundingDirectionDialog(courseElement);
+                return true;
+            }
+        });
+        
+        dragSortController = buildDragSortController(newCourseListView);
+        newCourseListView.setFloatViewManager(dragSortController);
+        newCourseListView.setOnTouchListener(dragSortController);
+        newCourseListView.setDragEnabled(dragEnabled);
+
+        if (getRace().getCourseDesign() != null) {
+            fillCourseElementsInList();
+        }
+
+        previousCourseListView = (ListView) getView().findViewById(R.id.listViewPreviousCourse);
+        previousCourseListView.setAdapter(previousCourseElementAdapter);
+
+        takePreviousButton = (Button) getView().findViewById(R.id.takePreviousCourseDesignButton);
+        takePreviousButton.setOnClickListener(new OnClickListener() {
+
+            public void onClick(View arg0) {
+                if (!previousCourseElements.isEmpty()) {
+                    if (!courseElements.isEmpty()) {
+                        createUsePreviousCourseDialog();
+                    } else {
+                        copyPreviousToNewCourseDesign();
+                    }
+                }
+                else {
+                    Toast.makeText(getActivity(), "No course available to copy", Toast.LENGTH_LONG).show();
+                }
+            }
+        });
+
+
+        publishButton = (Button) getView().findViewById(R.id.publishCourseDesignButton);
+        publishButton.setOnClickListener(new OnClickListener() {
+
+            public void onClick(View arg0) {
+                try {
+                    CourseBase courseData = convertCourseElementsToACourseData();
+                    sendCourseDataAndDismiss(courseData);
+                } catch (IllegalStateException ex) {
+                    if (ex.getMessage().equals("Gate has no right buoy")) {
+                        Toast.makeText(getActivity(), "A right buoy is missing for a gate. Please select the right buoy.", Toast.LENGTH_LONG).show();
+                    } else if (ex.getMessage().equals("Each waypoints needs a passing side")) {
+                        Toast.makeText(getActivity(), "A waypoint has no passing side. Please select the passing side by clicking long on the waypoint.", Toast.LENGTH_LONG).show();
+                    }
+                    
+                } catch (IllegalArgumentException ex) {
+                    Toast.makeText(getActivity(), "The course design has to have at least one waypoint.", Toast.LENGTH_LONG).show();
+                }
+            }
+
+        });
+
+        unpublishButton = (Button) getView().findViewById(R.id.unpublishCourseDesignButton);
+        unpublishButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View arg0) {
+                CourseBase emptyCourse = new CourseDataImpl("Unpublished course design");
+                sendCourseDataAndDismiss(emptyCourse);
+            }
+
+        });
+
+    }
+    
+    /**
+     * Creates a DragSortController and thereby defines the behaviour of the drag sort list
+     */
+    public DragSortController buildDragSortController(DragSortListView dragSortListView) {
+        DragSortController controller = new DragSortController(dragSortListView);
+        controller.setDragHandleId(R.id.drag_handle);
+        controller.setFlingHandleId(R.id.drag_handle);
+        controller.setRemoveEnabled(removeEnabled);
+        controller.setSortEnabled(sortEnabled);
+        controller.setDragInitMode(dragStartMode);
+        controller.setRemoveMode(removeMode);
+        controller.setBackgroundColor(getActivity().getResources().getColor(R.color.welter_medium_blue));
+        return controller;
+    }
+    
+    @Override
+    public void onResume() {
+        super.onResume();
+        onLoadMarksSucceeded(hostActivity.getDataManager().getDataStore().getMarks());
+    }
+    
+    private void loadCourseOnServer() {
+        hostActivity.getDataManager().loadCourse(getRace(), new LoadClient<CourseBase>() {
+
+            @Override
+            public void onLoadFailed(Exception reason) {
+                fillPreviousCourseElementsWithLastPublishedCourseDesign();
+            }
+
+            @Override
+            public void onLoadSucceded(CourseBase data) {
+                /*if (Util.size(data.getWaypoints()) > 0) {
+                    fillPreviousCourseElementsInList(data);
+                } else*/ {
+                    fillPreviousCourseElementsWithLastPublishedCourseDesign();
+                }
+                
+            }
+            
+        });
+    }
+    
+    private void fillPreviousCourseElementsWithLastPublishedCourseDesign() {
+        CourseBase lastPublishedCourseDesign = InMemoryDataStore.INSTANCE.getLastPublishedCourseDesign();
+        if(lastPublishedCourseDesign != null) {
+            fillPreviousCourseElementsInList(lastPublishedCourseDesign);
+        }
+    }
+
+    private void loadMarks() {
+        hostActivity.getDataManager().loadMarks(getRace(), new LoadClient<Collection<Mark>>() {
+
+            @Override
+            public void onLoadFailed(Exception reason) {
+            }
+
+            @Override
+            public void onLoadSucceded(Collection<Mark> data) {
+                onLoadMarksSucceeded(data);
+            }
+            
+        });
+    }
+
+    protected void onLoadMarksSucceeded(Collection<Mark> data) {
+        aMarkList.clear();
+        aMarkList.addAll(data);
+        Collections.sort(aMarkList, new NamedComparator());
+        gridAdapter.notifyDataSetChanged();
+    }
+
+    private void fillPreviousCourseElementsInList(CourseBase previousCourseData) {
+        if (previousCourseData != null) {
+            previousCourseElements.clear();
+            previousCourseElements.addAll(convertCourseDesignToCourseElements(previousCourseData));
+            previousCourseElementAdapter.notifyDataSetChanged();
+        }
+    }
+
+    private void fillCourseElementsInList() {
+        courseElements.clear();
+        courseElements.addAll(convertCourseDesignToCourseElements(getRace().getCourseDesign()));
+        courseElementAdapter.notifyDataSetChanged();
+    }
+
+    protected List<CourseListDataElement> convertCourseDesignToCourseElements(CourseBase courseData) {
+        List<CourseListDataElement> elementList = new ArrayList<CourseListDataElement>();
+
+        for (Waypoint waypoint : courseData.getWaypoints()) {
+            ControlPoint controlPoint = waypoint.getControlPoint();
+            
+            if (controlPoint instanceof Mark) {
+                CourseListDataElement element = new CourseListDataElement();
+                element.setLeftMark((Mark)controlPoint);
+                element.setRoundingDirection(getRoundingDirection(waypoint.getPassingSide()));
+                elementList.add(element);
+            } else if (controlPoint instanceof Gate) {
+                Gate gate = (Gate) controlPoint;
+                CourseListDataElement element = new CourseListDataElement();
+                element.setLeftMark(gate.getLeft());
+                element.setRightMark(gate.getRight());
+                element.setRoundingDirection(RoundingDirection.Gate);
+                elementList.add(element);
+            }
+        }
+
+        return elementList;
+    }
+
+    protected void sendCourseDataAndDismiss(CourseBase courseDesign) {
+        sendCourseData(courseDesign);
+        onPublish();
+        dismiss();
+    }
+
+    protected void sendCourseData(CourseBase courseDesign) {
+        getRace().getState().setCourseDesign(courseDesign);
+        saveChangedCourseDesignInCache(courseDesign);
+    }
+
+    private void saveChangedCourseDesignInCache(CourseBase courseDesign) {
+        if (!Util.isEmpty(courseDesign.getWaypoints())) {
+            InMemoryDataStore.INSTANCE.setLastPublishedCourseDesign(courseDesign);
+        }
+    }
+
+    protected CourseBase convertCourseElementsToACourseData() throws IllegalStateException, IllegalArgumentException {
+        CourseBase design = new CourseDataImpl("CourseTemplate");
+        List<Waypoint> waypoints = new ArrayList<Waypoint>();
+
+        for (CourseListDataElement courseElement : courseElements) {
+            if (courseElement.getRoundingDirection().equals(RoundingDirection.Gate) && courseElement.getRightMark() != null) {
+                String gateName = "Gate " + courseElement.getLeftMark().getName() + " / " + courseElement.getRightMark().getName();
+                Gate gate = new GateImpl(courseElement.getLeftMark(), courseElement.getRightMark(), gateName);
+                Waypoint waypoint = new WaypointImpl(gate);
+                
+                waypoints.add(waypoint);
+            } else if (courseElement.getRoundingDirection().equals(RoundingDirection.Gate) && courseElement.getRightMark() == null) {
+                throw new IllegalStateException("Gate has no right buoy");
+            } else if (courseElement.getRoundingDirection().equals(RoundingDirection.None)) {
+                throw new IllegalStateException("Each waypoints needs a passing side");
+            } else {
+                Waypoint waypoint = new WaypointImpl(courseElement.getLeftMark(), getNauticalSide(courseElement.getRoundingDirection()));
+                
+                waypoints.add(waypoint);
+            }
+
+        }
+        if (waypoints.isEmpty()) {
+            throw new IllegalArgumentException("The course design to be published has no waypoints.");
+        }
+
+        int i = 0;
+        for (Waypoint waypoint : waypoints) {
+            design.addWaypoint(i++, waypoint);
+        }
+
+        return design;
+    }
+
+    private NauticalSide getNauticalSide(RoundingDirection roundingDirection) {
+        NauticalSide side = null;
+        if (roundingDirection.name().equalsIgnoreCase(NauticalSide.PORT.name())) {
+            side = NauticalSide.PORT;
+        } else if (roundingDirection.name().equalsIgnoreCase(NauticalSide.STARBOARD.name())){
+            side = NauticalSide.STARBOARD;
+        }
+        return side;
+    }
+    
+    private RoundingDirection getRoundingDirection(NauticalSide passingSide) {
+        RoundingDirection direction = null;
+        if (passingSide == null) {
+            direction = RoundingDirection.None;
+        } else if (passingSide.name().equalsIgnoreCase(RoundingDirection.Port.name())) {
+            direction = RoundingDirection.Port;
+        } else if (passingSide.name().equalsIgnoreCase(RoundingDirection.Starboard.name())){
+            direction = RoundingDirection.Starboard;
+        } else {
+            direction = RoundingDirection.Gate;
+        }
+        return direction;
+    }
+
+    private void createUsePreviousCourseDialog() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle("Use previous course design");
+        builder.setMessage("Use previously published course design?");
+        builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                copyPreviousToNewCourseDesign();
+            }
+        });
+        builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                //do nothing
+            }
+        });
+        builder.create();
+        builder.show();
+    }
+    
+    protected void copyPreviousToNewCourseDesign() {
+        courseElements.clear();
+        courseElements.addAll(previousCourseElements);
+        courseElementAdapter.notifyDataSetChanged();
+}
+
+    protected void onMarkClickedOnGrid(Mark mark) {
+        if (courseElements.isEmpty()) {
+            addNewCourseElementToList(mark);
+        } else {
+            CourseListDataElement gateCourseElement = getFirstGateCourseElementWithoutRightMark();
+            if (gateCourseElement != null) {
+                gateCourseElement.setRightMark(mark);
+                courseElementAdapter.notifyDataSetChanged();
+            } else {
+                addNewCourseElementToList(mark);
+            }
+        }
+    }
+    
+    private CourseListDataElement getFirstGateCourseElementWithoutRightMark() {
+        for (CourseListDataElement courseElement : courseElements) {
+            if (courseElement.getRoundingDirection().equals(RoundingDirection.Gate) && courseElement.getRightMark() == null) {
+                return courseElement;
+            }
+        }
+        return null;
+    }
+
+    private void addNewCourseElementToList(Mark mark) {
+        CourseListDataElement courseElement = new CourseListDataElement();
+        courseElement.setLeftMark(mark);
+        createRoundingDirectionDialog(courseElement);
+    }
+
+    private void createRoundingDirectionDialog(final CourseListDataElement courseElement) {
+        List<String> directions = new ArrayList<String>();
+        for (RoundingDirection direction : RoundingDirection.relevantValues()) {
+            directions.add(direction.name());
+        }
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setTitle(R.string.pick_a_rounding_direction)
+        .setItems(R.array.rounding_directions, new DialogInterface.OnClickListener() {
+            public void onClick(DialogInterface dialog, int position) {
+                String[] directions = getActivity().getResources().getStringArray(R.array.rounding_directions);
+                RoundingDirection pickedDirection = RoundingDirection.valueOf(directions[position]);
+                onRoundingDirectionPicked(courseElement, pickedDirection);
+            }
+        });
+        builder.create();
+        builder.show();
+    }
+
+    protected void onRoundingDirectionPicked(CourseListDataElement courseElement, RoundingDirection pickedDirection) {
+        courseElement.setRoundingDirection(pickedDirection);
+        if (!courseElements.contains(courseElement)) {
+            courseElements.add(courseElement);
+        }
+        courseElementAdapter.notifyDataSetChanged();
+    }
+
+    protected void onPublish() {
+        if (getHost() != null) {
+            getHost().onCourseDesignPublish();
+        } else {
+            ExLog.w(TAG, "Dialog host was null.");
+        }
+    }
+
+    @Override
+    public void notifyTick() {
+        
+    }
+
+}
diff --git a/mobile/google-play-services_lib/bin/google-play-services_lib.jar b/mobile/google-play-services_lib/bin/google-play-services_lib.jar
index 17e3090ede1..44df0ded4a9 100644
Binary files a/mobile/google-play-services_lib/bin/google-play-services_lib.jar and b/mobile/google-play-services_lib/bin/google-play-services_lib.jar differ