diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_transparent.xml b/mobile/com.sap.sailing.android.shared/res/drawable/rounded_btn_transparent.xml
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_transparent.xml
rename to mobile/com.sap.sailing.android.shared/res/drawable/rounded_btn_transparent.xml
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/yellow_arrow_right.png b/mobile/com.sap.sailing.android.shared/res/drawable/yellow_arrow_right.png
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/drawable/yellow_arrow_right.png
rename to mobile/com.sap.sailing.android.shared/res/drawable/yellow_arrow_right.png
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml b/mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/layout/ragatta_listview_row.xml
rename to mobile/com.sap.sailing.android.shared/res/layout/ragatta_listview_row.xml
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml b/mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
similarity index 100%
rename from mobile/com.sap.sailing.android.tracking.app/res/layout/regatta_listview_header.xml
rename to mobile/com.sap.sailing.android.shared/res/layout/regatta_listview_header.xml
diff --git a/mobile/com.sap.sailing.android.shared/res/values-de/strings.xml b/mobile/com.sap.sailing.android.shared/res/values-de/strings.xml
index 473eac71fdb..957bdb631f6 100644
--- a/mobile/com.sap.sailing.android.shared/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values-de/strings.xml
@@ -24,5 +24,10 @@
 	<string name="scanning_cancelled">Scan abgebrochen</string>
 	<string name="error_scanning_qrcode">Fehler beim Scannen des QR-Codes {result-code}</string>
 	<string name="notify_user_api_call_failed">Bei der Kommunikation mit dem Server ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal.</string>
-
+	<string name="please_wait">Bitte warten</string>
+	<string name="error_invalid_qr_code">Ungültiger QR-Code</string>
+	
+	<!-- Regatta -->
+    <string name="your_regattas">Ihre Regattas:</string>
+    
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.shared/res/values/colors.xml b/mobile/com.sap.sailing.android.shared/res/values/colors.xml
index 1d9bd14ba07..3aa12e453e6 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/colors.xml
@@ -36,6 +36,7 @@
 	<color name="welter_blue">#ff0000ff</color>
 	
 	<color name="black">#000000</color>
+	<color name="black_transparent">#55000000</color>
 	<color name="white">#FFFFFF</color>
 	<color name="white_less_transparent">#CCFFFFFF</color>
 	<color name="sap_green">#8AB54E</color>
diff --git a/mobile/com.sap.sailing.android.shared/res/values/strings.xml b/mobile/com.sap.sailing.android.shared/res/values/strings.xml
index 612008f9102..53d4c1e697b 100644
--- a/mobile/com.sap.sailing.android.shared/res/values/strings.xml
+++ b/mobile/com.sap.sailing.android.shared/res/values/strings.xml
@@ -19,6 +19,8 @@
     <!-- Generic -->
     <string name="empty" translatable="false"></string>
     <string name="generic_error">Error</string>
+    
+    <!-- Signal quality -->
     <string name="signal_accuracy_indicator_view_description">GPS Accuracy</string>
     <string name="poor">poor</string>
     <string name="good">good</string>
@@ -26,6 +28,9 @@
     <string name="no_signal">no signal</string>
     <string name="ok">OK</string>
     
+    <!-- Regatta -->
+    <string name="your_regattas">Your Regattas:</string>
+    
     <!-- QR Code -->
     <string name="notify_user_db_operation_failed">Error: Database operation has failed.</string>
 	<string name="no_qr_code_popup_title">No QR-Code?</string>
@@ -34,4 +39,7 @@
 	<string name="scanning_cancelled">Scanning cancelled</string>
 	<string name="error_scanning_qrcode">Error scanning QR-Code {result-code}</string>
 	<string name="notify_user_api_call_failed">An error occurred while contacting the server. Please try again.</string>
+	<string name="please_wait">Please wait</string>
+	<string name="error_invalid_qr_code">Invalid QR-Code</string>
+	<string name="checkin_digest" translatable="false">CheckinDigest</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_white.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_white.xml
deleted file mode 100644
index 4ca5d0ad3b4..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_white.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/white_less_transparent" />
-
-    <stroke
-        android:width="1dp"
-        android:color="@color/white" />
-
-    <corners
-        android:bottomLeftRadius="5dip"
-        android:bottomRightRadius="5dip"
-        android:topLeftRadius="5dip"
-        android:topRightRadius="5dip" />
-
-</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_yellow.xml b/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_yellow.xml
deleted file mode 100644
index c012d9f485b..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/drawable/rounded_btn_yellow.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/sap_yellow" />
-
-    <corners
-        android:bottomLeftRadius="5dip"
-        android:bottomRightRadius="5dip"
-        android:topLeftRadius="5dip"
-        android:topRightRadius="5dip" />
-</shape>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
deleted file mode 100644
index bf374a68b02..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar" >
-
-        <LinearLayout android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="10dp">
-             
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                android:id="@+id/toolbar_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:lines="1"
-                android:singleLine="true"
-                android:textSize="16sp"/>
-
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                android:id="@+id/toolbar_subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:lines="1"
-                android:singleLine="true"
-                android:textSize="12sp" />
-            
-        </LinearLayout>
-        
-    </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
-
-    <FrameLayout
-        android:id="@+id/content_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
deleted file mode 100644
index aa16f58a387..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <ImageView
-        android:id="@+id/homeBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignParentBottom="true"
-        android:contentDescription="@string/empty"
-        android:scaleType="centerCrop"
-        android:src="@drawable/working_title" />
-         
-
-    <RelativeLayout
-        android:id="@+id/bottomLayout"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_alignParentBottom="true"
-        android:background="@+color/black_transparent"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true">
-
-        <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="@string/scan_hint"
-            android:textColor="@color/white" />
-    </RelativeLayout>
-
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
-        android:id="@+id/scanQr"
-        android:layout_width="fill_parent"
-        android:layout_height="80dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginBottom="10dp"
-        android:layout_marginTop="10dp"
-        android:layout_above="@+id/noQrCode"
-        android:background="@drawable/rounded_btn_yellow"
-        android:textAllCaps="true"
-        android:textStyle="bold"
-        android:text="@string/scan_qr" />
-        
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansButton
-        android:id="@+id/noQrCode"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/bottomLayout"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:background="@drawable/rounded_btn_white"
-        android:textColor="@color/black"
-        android:text="@string/no_qr_code" />
-
-    <ListView
-        android:id="@+id/listRegatta"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/scanQr"
-        android:layout_alignParentTop="true"
-        android:divider="@android:color/white"
-  		android:dividerHeight="1dp" >
-
-    </ListView>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml
deleted file mode 100644
index e93db488893..00000000000
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/ThemeOverlay.AppCompat.ActionBar" >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:padding="0dp" >
-
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                android:id="@+id/toolbar_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:lines="1"
-                android:singleLine="true"
-                android:textSize="16sp" />
-
-            <com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
-                android:id="@+id/toolbar_subtitle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:lines="1"
-                android:singleLine="true"
-                android:textSize="12sp" />
-        </LinearLayout>
-    </com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
-    
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/title_page_indicator"
-        android:layout_below="@id/toolbar"
-        android:orientation="vertical" >
-
-        <RelativeLayout
-            android:id="@+id/tracking_linear_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:padding="0dp" >
-        </RelativeLayout>
-
-        <android.support.v4.view.ViewPager
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/pager"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
-	</LinearLayout>
-    
-	<com.viewpagerindicator.CirclePageIndicator
-        android:id="@+id/title_page_indicator"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:paddingBottom="10dp"	
-        android:background="@color/black"
-        android:paddingTop="10dp" />
-    
-    
-<!-- <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar" >
-
-        <FrameLayout
-            android:id="@+id/content_frame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <FrameLayout
-            android:id="@+id/hud_content_frame"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </FrameLayout> -->
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
index cd69c5f4285..84d57a7f5c1 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
@@ -37,7 +37,6 @@
     <string name="existing_image">Auswählen</string>
     <string name="take_photo">Foto aufnehmen</string>
     <string name="add_photo_select">Foto</string>
-    <string name="please_wait">Bitte warten</string>
     <string name="checking_in">Checke ein..</string>
     <string name="checking_out">Checke aus..</string>
     <string name="getting_event">Hole Event-Daten..</string>
@@ -53,12 +52,9 @@
     <string name="days">Tage</string>
     <string name="hour">Stunde</string>
     <string name="day">Tag</string>
-    <string name="longitude">Breitengrad</string>
-    <string name="latitude">Längengrad</string>
     <string name="please_listen_to_announcements">Bitte achten Sie auf die Durchsagen</string>
     <string name="no_qr_code">Sie haben keinen QR-Code?</string>
     <string name="scan_qr">QR-Code scannen</string>
-    <string name="your_regattas">Ihre Regattas:</string>
     <string name="close">Schließen</string>
     <string name="thank_you_you_successfully_participated">Vielen Dank, Sie haben erfolgreich an der Regatta teilgenommen.\n\nIhr SAP Sailing Team</string>
 	<string name="tracking_colon">Tracke:</string>
@@ -71,15 +67,10 @@
 	<string name="show_leaderboard">Leaderboard</string>
 	<string name="desc_regatta_user_image">Benutzerdefiniertes Bild für Regatta</string>
 	<string name="desc_add_photo_button">Foto hinzufügen Button</string>
-	<string name="error_invalid_qr_code">Ungültiger QR-Code</string>
 	<string name="error_while_receiving_server_data">Fehler beim Empfang vom Server</string>
 	<string name="info_already_checked_in_this_qr_code">Bereits für diese Regatta eingecheckt</string>
 	<string name="warning">Warnung</string>
 	<string name="gps_turned_off">GPS ist nicht aktiviert. Bitte aktivieren Sie den Standortzugriff (GPS) in Ihren Android-Einstellungen!</string>
-    <string name="set_position">Position setzen</string>
-    <string name="reset_position">Position zurücksetzen</string>
     <string name="knots">Knoten</string>
 	<string name="preferences">Einstellungen</string>
-    <string name="course_type">Kurstyp</string>
-    <string name="marks">Kursmarkierungen</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
index 4a57025308d..891c613302b 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/colors.xml
@@ -3,7 +3,6 @@
     <color name="white">#FFFFFF</color>
     <color name="white_transparent">#55FFFFFF</color>
     <color name="white_less_transparent">#CCFFFFFF</color>
-    <color name="black_transparent">#55000000</color>
     <color name="green">#00FF00</color>
     <color name="gray">#333333</color>
     <color name="darker_gray">#242424</color>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
index 2375c174d0e..659ac82bb1d 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
@@ -18,13 +18,11 @@
     <string name="title_activity_tracking">Tracking</string>
     <string name="please_confirm">Please confirm</string>
     <string name="do_you_really_want_to_stop_tracking">Do you really want to stop tracking?</string>
-	<string name="checkin_digest" translatable="false">CheckinDigest</string>
 	<string name="add_team_photo">Add Team Photo</string>
 	<string name="do_you_want_to_choose_existing_img_or_take_a_new_one">Do you want to use an existing image or take a new one?</string>
 	<string name="existing_image">Existing</string>
 	<string name="take_photo">Take Photo</string>
 	<string name="add_photo_select">Photo</string>
-	<string name="please_wait">Please wait</string>
 	<string name="checking_in">Checking in..</string>
 	<string name="checking_out">Checking out..</string>
 	<string name="getting_event">Getting event informatiopn..</string>
@@ -40,10 +38,7 @@
 	<string name="hour">Hour</string>
 	<string name="minute">Minute</string>
 	<string name="day">Day</string>
-    <string name="longitude">Longitude</string>
-    <string name="latitude">Latitude</string>
 	<string name="please_listen_to_announcements">Please listen to the announcements</string>
-	<string name="your_regattas">Your Regattas:</string>
 	<string name="close">Close</string>
 	<string name="thank_you_you_successfully_participated">Thank you, you have successfully taken part in the regatta.\n\nYour SAP Sailing Team</string>
 	<string name="tracking_colon">Tracking:</string>
@@ -53,17 +48,12 @@
     <string name="speed_over_ground">Speed over Ground</string>
 	<string name="none">None</string>
 	<string name="show_leaderboard">Leader board</string>
-	<string name="error_invalid_qr_code">Invalid QR-Code</string>
 	<string name="error_while_receiving_server_data">Error while receiving server data</string>
 	<string name="info_already_checked_in_this_qr_code">Already checked in to this regatta</string>
 	<string name="warning">Warning</string>
 	<string name="gps_turned_off">GPS is turned off. Please turn on location access (GPS) in your Android Settings!</string>
-    <string name="set_position">Set Position</string>
-    <string name="reset_position">Reset Position</string>
 	<string name="knots">knots</string>
 	<string name="preferences">Preferences</string>
-    <string name="course_type">Course Type</string>
-    <string name="marks">Marks</string>
 	
 	<string name="initial_timer_text_zerozero" translatable="false">00:00:00</string>
 	<string name="initial_hyphen" translatable="false">-</string>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__styles.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__styles.xml
index 46b85a80ded..72d05aa4abb 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__styles.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/vpi__styles.xml
@@ -45,10 +45,4 @@
         <item name="android:layout_marginRight">6dp</item>
     </style>
 
-    <style name="Divider">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:background">?android:attr/listDivider</item>
-    </style>
-
 </resources>
diff --git a/mobile/com.sap.sailing.buoy.positioning/.classpath b/mobile/com.sap.sailing.buoy.positioning/.classpath
index 7bc01d9a9c6..7a4fe976c87 100644
--- a/mobile/com.sap.sailing.buoy.positioning/.classpath
+++ b/mobile/com.sap.sailing.buoy.positioning/.classpath
@@ -5,5 +5,6 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/com.sap.sailing.android.shared"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml b/mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml
index 7b171bdf6ae..dad55c357a9 100644
--- a/mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/AndroidManifest.xml
@@ -7,11 +7,62 @@
         android:minSdkVersion="14"
         android:targetSdkVersion="22" />
 
+    <permission
+        android:name="com.sap.sailing.android.tracking.app.permission.C2D_MESSAGE"
+        android:protectionLevel="signature" />
+
+    <!-- <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" /> -->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <uses-permission android:name="com.sap.sailing.android.tracking.app.permission.C2D_MESSAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+
     <application
+        android:name="com.sap.sailing.android.shared.application.LoggableApplication"
         android:allowBackup="true"
+        android:hardwareAccelerated="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version" />
+
+        <activity
+            android:name=".ui.activities.StartActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="unspecified" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="*"
+                    android:pathPattern=".*tracking/checkin.*"
+                    android:scheme="http" />
+                <data
+                    android:host="*"
+                    android:pathPattern=".*tracking/checkin.*"
+                    android:scheme="http" />
+            </intent-filter>
+        </activity>
+
+        <provider
+            android:name="com.sap.sailing.android.buoy.positioning.app.provider.AnalyticsProvider"
+            android:authorities="com.sap.sailing.android.buoy.positioning.app.provider.db"
+            android:exported="false" />
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/ic_launcher-web.png b/mobile/com.sap.sailing.buoy.positioning/ic_launcher-web.png
deleted file mode 100644
index a18cbb48c43..00000000000
Binary files a/mobile/com.sap.sailing.buoy.positioning/ic_launcher-web.png and /dev/null differ
diff --git a/mobile/com.sap.sailing.buoy.positioning/pom.xml b/mobile/com.sap.sailing.buoy.positioning/pom.xml
new file mode 100644
index 00000000000..1d001e40448
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>com.sap.sailing</groupId>
+        <artifactId>mobile</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>com.sap.sailing</groupId>
+    <artifactId>com.sap.sailing.android.buoy.positioning.app</artifactId>
+    <packaging>apk</packaging>
+
+    <properties>
+        <!-- If you change this name, change in app too! -->
+        <additional-deployment-version-file>com.sap.sailing.android.buoy.positioning.app.version</additional-deployment-version-file>
+        <!-- passed by buildAndUpdateProduct.sh (parsed from AndroidManifest.xml) -->
+        <app-version>${buoy.positioning-app-version}</app-version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>android</groupId>
+            <artifactId>android</artifactId>
+        </dependency>
+
+<!--
+        <dependency>
+            <groupId>com.android.support</groupId>
+            <artifactId>support-annotations</artifactId>
+            <version>21.0.3</version>
+            <type>aar</type>
+        </dependency>
+-->
+
+        <dependency>
+            <groupId>com.android.support</groupId>
+            <artifactId>support-v4</artifactId>
+            <version>21.0.3</version>
+            <type>aar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>com.android.support</groupId>
+            <artifactId>appcompat-v7</artifactId>
+            <version>21.0.3</version>
+            <type>aar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.android.gms</groupId>
+            <artifactId>play-services</artifactId>
+            <version>6.5.87</version>
+            <type>aar</type>
+        </dependency>
+
+        <dependency>
+          <groupId>com.sap.sailing</groupId>
+          <artifactId>com.sap.sailing.android.shared</artifactId>
+          <version>1.0.0-SNAPSHOT</version>
+          <type>apklib</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <sourceDirectory>src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+                <configuration>
+                    <undeployBeforeDeploy>true</undeployBeforeDeploy>
+                    <extractDuplicates>true</extractDuplicates>
+                    <sdk>
+                        <platform>21</platform>
+                    </sdk>
+                    <release>true</release>
+                    <proguard>
+                     <!-- Someone needs to look into this - quite hard to find a configuration that doesnt break everything -->
+                        <skip>true</skip>
+                        <config>proguard-project.txt</config>
+                        <configs>
+                            <config>${env.ANDROID_HOME}/tools/proguard/proguard-android.txt</config>
+                        </configs>
+                    </proguard>
+                    <zipalign>
+                        <skip>false</skip>
+                    </zipalign>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>apk</goal>
+                        </goals>
+                        <configuration>
+                            <excludeJarResources>
+                                <!-- Prevents *-sources.jar to be distributed with the APK -->
+                                <excludeJarResource>^com\.sap\..*.jar$</excludeJarResource>
+                            </excludeJarResources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- plugins for generating version file and copying .apk -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/mobile/com.sap.sailing.buoy.positioning/project.properties b/mobile/com.sap.sailing.buoy.positioning/project.properties
index 00cf62bacc1..b5c315ef4ec 100644
--- a/mobile/com.sap.sailing.buoy.positioning/project.properties
+++ b/mobile/com.sap.sailing.buoy.positioning/project.properties
@@ -11,4 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-22
+target=Google Inc.:Google APIs:22
+android.library.reference.1=../com.sap.sailing.android.shared
+android.library.reference.2=../google-play-services_lib
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_detail.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
similarity index 85%
rename from mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_detail.xml
rename to mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
index 8cb9519d520..613d5d7f406 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_detail.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_detail.xml
@@ -5,9 +5,9 @@
     android:background="@color/black"
     android:orientation="vertical"
     android:paddingLeft="0dp"
-    android:paddingRight="0dp">
+    android:paddingRight="0dp" >
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+    <com.sap.sailing.android.shared.customviews.OpenSansTextView
         android:id="@+id/mark_header"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -22,7 +22,7 @@
         android:textColor="@color/white"
         android:textSize="10sp" />
 
-    <fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    <fragment
         android:id="@+id/map"
         android:name="com.google.android.gms.maps.MapFragment"
         android:layout_width="match_parent"
@@ -38,9 +38,9 @@
         android:paddingBottom="15dp"
         android:paddingLeft="10dp"
         android:paddingRight="7dp"
-        android:paddingTop="15dp">
+        android:paddingTop="15dp" >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.customviews.OpenSansTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/signal_accuracy_indicator_view_description"
@@ -48,12 +48,13 @@
             android:textSize="16sp" />
 
         <!-- Empty view to right align the following element -->
+
         <View
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_weight="1" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.customviews.OpenSansTextView
             android:id="@+id/marker_gps_accuracy"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -72,9 +73,9 @@
         android:paddingBottom="15dp"
         android:paddingLeft="10dp"
         android:paddingRight="7dp"
-        android:paddingTop="15dp">
+        android:paddingTop="15dp" >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.customviews.OpenSansTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/longitude"
@@ -82,12 +83,13 @@
             android:textSize="16sp" />
 
         <!-- Empty view to right align the following element -->
+
         <View
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_weight="1" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.customviews.OpenSansTextView
             android:id="@+id/marker_gps_longitude"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -105,9 +107,9 @@
         android:paddingBottom="15dp"
         android:paddingLeft="10dp"
         android:paddingRight="7dp"
-        android:paddingTop="15dp">
+        android:paddingTop="15dp" >
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.customviews.OpenSansTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/latitude"
@@ -115,12 +117,13 @@
             android:textSize="16sp" />
 
         <!-- Empty view to right align the following element -->
+
         <View
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_weight="1" />
 
-        <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+        <com.sap.sailing.android.shared.customviews.OpenSansTextView
             android:id="@+id/marker_gps_latitude"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -131,7 +134,7 @@
 
     <View style="@style/Divider" />
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+    <com.sap.sailing.android.shared.customviews.OpenSansButton
         android:id="@+id/marker_set_position_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -143,16 +146,17 @@
         android:textSize="14sp"
         android:textStyle="bold" />
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansButton
+    <com.sap.sailing.android.shared.customviews.OpenSansButton
         android:id="@+id/marker_reset_position_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="15dp"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="5dp"
-        android:layout_marginBottom="15dp"
         android:background="@drawable/rounded_btn_transparent"
         android:text="@string/reset_position"
         android:textSize="14sp"
         android:textStyle="bold" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_overview.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
similarity index 87%
rename from mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_overview.xml
rename to mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
index 5f2c966cd93..ab70a1f596f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_buoy_postion_overview.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/fragment_buoy_postion_overview.xml
@@ -7,7 +7,7 @@
     android:paddingLeft="10dp"
     android:paddingRight="10dp">
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+    <com.sap.sailing.android.shared.customviews.OpenSansTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="18dp"
@@ -15,7 +15,7 @@
         android:textSize="18sp" />
 
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+    <com.sap.sailing.android.shared.customviews.OpenSansTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/mark_listview_row.xml b/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml
similarity index 91%
rename from mobile/com.sap.sailing.android.tracking.app/res/layout/mark_listview_row.xml
rename to mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml
index df113e90046..3435505ecf6 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/mark_listview_row.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/layout/mark_listview_row.xml
@@ -16,7 +16,7 @@
         android:src="@drawable/yellow_arrow_right"
         android:textColor="@color/white" />
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+    <com.sap.sailing.android.shared.customviews.OpenSansTextView
         android:id="@+id/mark_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
         android:singleLine="true"
         android:textColor="@color/white" />
 
-    <com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
+    <com.sap.sailing.android.shared.customviews.OpenSansTextView
         android:id="@+id/mark_set"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml b/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml
new file mode 100644
index 00000000000..5f3c965df25
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values-de/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="course_type">Kurstyp</string>
+    <string name="marks">Kursmarkierungen</string>
+    <string name="longitude">Breitengrad</string>
+    <string name="latitude">Längengrad</string>
+    <string name="set_position">Position setzen</string>
+    <string name="reset_position">Position zurücksetzen</string>
+    <string name="getting_marks">Empfangen der Markierungen..</string>
+
+</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/api_endpoints.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/api_endpoints.xml
new file mode 100644
index 00000000000..4bac2c2c624
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/api_endpoints.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="preference_server_gps_fixes_post_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard-name}/marks/{mark-id}/gps_fixes</string>
+    <string name="preference_server_marks_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard-name}/marks?</string>
+    <string name="preference_server_leaderboard_path" translatable="false">/sailingserver/api/v1/leaderboards/{leaderboard_name}</string>
+</resources>
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
index 8d7bb543cd1..51916255459 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/strings.xml
@@ -1,5 +1,13 @@
 <resources>
 
-    <string name="app_name">Buoy Positioning App</string>
+    <string name="app_name">SAP Buoy Positioning App</string>
+    <string name="title_activity_start" translatable="false">Buoy Positioning App</string>
+    <string name="course_type">Course Type</string>
+    <string name="marks">Marks</string>
+    <string name="longitude">Longitude</string>
+    <string name="latitude">Latitude</string>
+    <string name="set_position">Set Position</string>
+    <string name="reset_position">Reset Position</string>
+    <string name="getting_marks">Getting race marks..</string>
 
-</resources>
+</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.buoy.positioning/res/values/styles.xml b/mobile/com.sap.sailing.buoy.positioning/res/values/styles.xml
index 6ce89c7ba43..e0c10426a12 100644
--- a/mobile/com.sap.sailing.buoy.positioning/res/values/styles.xml
+++ b/mobile/com.sap.sailing.buoy.positioning/res/values/styles.xml
@@ -17,4 +17,10 @@
         <!-- All customizations that are NOT specific to a particular API-level can go here. -->
     </style>
 
-</resources>
+    <style name="Divider">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">1dp</item>
+        <item name="android:background">?android:attr/listDivider</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/adapter/MarkAdapter.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/MarkAdapter.java
similarity index 83%
rename from mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/adapter/MarkAdapter.java
rename to mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/MarkAdapter.java
index 3598d16d8fc..36b78e14029 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/adapter/MarkAdapter.java
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/MarkAdapter.java
@@ -1,4 +1,7 @@
-package com.sap.sailing.android.tracking.app.adapter;
+package com.sap.sailing.android.buoy.positioning.app.adapter;
+
+
+import com.sap.sailing.android.buoy.positioning.app.R;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -6,7 +9,6 @@ import android.support.v4.widget.ResourceCursorAdapter;
 import android.view.View;
 import android.widget.TextView;
 
-import com.sap.sailing.android.tracking.app.R;
 
 public class MarkAdapter extends ResourceCursorAdapter {
 
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/RegattaAdapter.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/RegattaAdapter.java
new file mode 100644
index 00000000000..35bcc1de47c
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/adapter/RegattaAdapter.java
@@ -0,0 +1,26 @@
+package com.sap.sailing.android.buoy.positioning.app.adapter;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.view.View;
+import android.widget.TextView;
+
+import com.sap.sailing.android.buoy.positioning.app.R;
+import com.sap.sailing.android.shared.ui.adapters.AbstractRegattaAdapter;
+
+public class RegattaAdapter extends AbstractRegattaAdapter {
+
+    public RegattaAdapter(Context context, int layout, Cursor cursor, int flags) {
+        super(context, layout, cursor, flags);
+    }
+
+    @Override
+    public void bindView(View view, Context context, Cursor cursor) {
+       TextView name = (TextView) view.findViewById(R.id.regattaName);
+       if (name != null) {
+           //String text = cursor.getString(cursor.getColumnIndex(AnalyticsContract.Event.EVENT_NAME));
+           //text += " (" + cursor.getString(cursor.getColumnIndex(AnalyticsContract.Competitor.COMPETITOR_DISPLAY_NAME)) + ")";
+           //name.setText(text);
+       }
+    }
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/BaseActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/BaseActivity.java
new file mode 100644
index 00000000000..fc61948b3aa
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/BaseActivity.java
@@ -0,0 +1,39 @@
+package com.sap.sailing.android.buoy.positioning.app.ui.activities;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.sap.sailing.android.buoy.positioning.app.util.AppPreferences;
+import com.sap.sailing.android.shared.ui.activities.AbstractBaseActivity;
+
+public class BaseActivity extends AbstractBaseActivity {
+	
+    protected AppPreferences prefs;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        prefs = new AppPreferences(this);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        //MenuInflater inflater = getMenuInflater();
+        //inflater.inflate(R.menu.options_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+        default:
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    protected int getOptionsMenuResId() {
+        return 0;
+    }
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
new file mode 100644
index 00000000000..51f4cc333fe
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/RegattaActivity.java
@@ -0,0 +1,20 @@
+package com.sap.sailing.android.buoy.positioning.app.ui.activities;
+
+import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.ui.activities.AbstractRegattaActivity;
+
+public class RegattaActivity extends AbstractRegattaActivity{
+
+	@Override
+	public void onCheckinDataAvailable(AbstractCheckinData arg0) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	protected int getOptionsMenuResId() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java
new file mode 100644
index 00000000000..44f003b05ef
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/activities/StartActivity.java
@@ -0,0 +1,40 @@
+package com.sap.sailing.android.buoy.positioning.app.ui.activities;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.sap.sailing.android.buoy.positioning.app.R;
+import com.sap.sailing.android.buoy.positioning.app.ui.fragments.HomeFragment;
+import com.sap.sailing.android.shared.ui.activities.AbstractBaseActivity;
+import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
+
+
+public class StartActivity extends AbstractBaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getSupportActionBar() != null) {
+			getSupportActionBar().setTitle(getString(R.string.title_activity_start));
+			getSupportActionBar().setHomeButtonEnabled(false);
+        }
+        replaceFragment(R.id.content_frame, new HomeFragment());
+    }
+    
+	@Override
+	protected int getOptionsMenuResId() {
+		return 0;
+	}
+
+	public AbstractHomeFragment getHomeFragment() {
+		HomeFragment homeFragment = (HomeFragment) getSupportFragmentManager()
+				.findFragmentById(R.id.content_frame);
+		return homeFragment;
+	}
+	
+	public void startRegatta(String checkinDigest) {
+		Intent intent = new Intent(this, RegattaActivity.class);
+		intent.putExtra(getString(R.string.checkin_digest), checkinDigest);
+		startActivity(intent);
+	}
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java
new file mode 100644
index 00000000000..58ac162aa6a
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/ui/fragments/HomeFragment.java
@@ -0,0 +1,153 @@
+package com.sap.sailing.android.buoy.positioning.app.ui.fragments;
+
+import org.json.JSONObject;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.LoaderManager.LoaderCallbacks;
+import android.support.v4.content.CursorLoader;
+import android.support.v4.content.Loader;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import com.sap.sailing.android.buoy.positioning.app.R;
+import com.sap.sailing.android.buoy.positioning.app.adapter.RegattaAdapter;
+import com.sap.sailing.android.buoy.positioning.app.ui.activities.RegattaActivity;
+import com.sap.sailing.android.buoy.positioning.app.ui.activities.StartActivity;
+import com.sap.sailing.android.buoy.positioning.app.util.AppPreferences;
+import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.logging.ExLog;
+import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperError;
+import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperFailureListener;
+import com.sap.sailing.android.shared.util.NetworkHelper.NetworkHelperSuccessListener;
+import com.sap.sailing.android.ui.fragments.AbstractHomeFragment;
+
+public class HomeFragment extends AbstractHomeFragment implements LoaderCallbacks<Cursor> {
+
+	private final static String TAG = HomeFragment.class.getName();
+
+	@SuppressLint("InflateParams")
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		View view = super.onCreateView(inflater, container, savedInstanceState);
+
+		prefs = new AppPreferences(getActivity());
+
+		ListView listView = (ListView) view.findViewById(R.id.listRegatta);
+		if (listView != null) {
+			listView.addHeaderView(inflater.inflate(
+					R.layout.regatta_listview_header, null));
+
+			adapter = new RegattaAdapter(getActivity(),
+					R.layout.ragatta_listview_row, null, 0);
+			listView.setAdapter(adapter);
+			listView.setOnItemClickListener(new ItemClickListener());
+		}
+
+		getLoaderManager().initLoader(REGATTA_LOADER, null, this);
+
+		return view;
+	}
+	
+	@Override
+    public void onResume() {
+        super.onResume();
+        getLoaderManager().restartLoader(REGATTA_LOADER, null, this);
+
+        String lastQRCode = prefs.getLastScannedQRCode();
+        if (lastQRCode != null) {
+            handleQRCode(lastQRCode);
+        }
+    }
+
+	@Override
+	public void displayUserConfirmationScreen(AbstractCheckinData data) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void handleScannedOrUrlMatchedUri(Uri uri) {
+		// TODO Auto-generated method stub
+
+	}
+	
+	/**
+     * Start regatta activity.
+     * 
+     * @param checkinDigest
+     */
+    private void startRegatta(String checkinDigest) {
+        Intent intent = new Intent(getActivity(), RegattaActivity.class);
+        intent.putExtra(getString(R.string.checkin_digest), checkinDigest);
+        getActivity().startActivity(intent);
+    }
+
+    @Override
+    public Loader<Cursor> onCreateLoader(int loaderId, Bundle bundle) {
+        switch (loaderId) {
+        case REGATTA_LOADER:
+            String[] projection = new String[] { "events.event_checkin_digest", "events.event_id", "events._id",
+                    "events.event_name", "events.event_server", "competitors.competitor_display_name",
+                    "competitors.competitor_id", "leaderboards.leaderboard_name",
+                    "competitors.competitor_country_code", "competitors.competitor_sail_id" };
+            return new CursorLoader(getActivity(), AnalyticsContract.EventLeaderboardCompetitorJoined.CONTENT_URI,
+                    projection, null, null, null);
+
+        default:
+            return null;
+        }
+    }
+
+    @Override
+    public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
+        switch (loader.getId()) {
+        case REGATTA_LOADER:
+            adapter.changeCursor(cursor);
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    @Override
+    public void onLoaderReset(Loader<Cursor> loader) {
+        switch (loader.getId()) {
+        case REGATTA_LOADER:
+            adapter.changeCursor(null);
+            break;
+
+        default:
+            break;
+        }
+    }
+
+    private class ItemClickListener implements OnItemClickListener {
+
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+
+            if (position < 1) // tapped header
+            {
+                return;
+            }
+
+            // -1, because there's a header row
+            Cursor cursor = (Cursor) adapter.getItem(position - 1);
+
+            String checkinDigest = cursor.getString(cursor.getColumnIndex("event_checkin_digest"));
+            startRegatta(checkinDigest);
+        }
+    }
+
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/AppPreferences.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/AppPreferences.java
new file mode 100644
index 00000000000..7c6f4ff8404
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/AppPreferences.java
@@ -0,0 +1,17 @@
+package com.sap.sailing.android.buoy.positioning.app.util;
+
+import android.content.Context;
+
+import com.sap.sailing.android.buoy.positioning.app.R;
+import com.sap.sailing.android.shared.util.BaseAppPreferences;
+
+public class AppPreferences extends BaseAppPreferences{
+
+	public AppPreferences(Context context) {
+		super(context);
+	}
+
+	public String getServerLeaderboardPath(String leaderboardName) {
+    	return context.getString(R.string.preference_server_leaderboard_path, "/leaderboards").replace("{leaderboard_name}", leaderboardName);
+    }
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
new file mode 100644
index 00000000000..8cb183895cc
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/util/CheckinManager.java
@@ -0,0 +1,228 @@
+package com.sap.sailing.android.buoy.positioning.app.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.security.NoSuchAlgorithmException;
+import java.util.UUID;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.net.Uri;
+import android.widget.Toast;
+
+import com.sap.sailing.android.buoy.positioning.app.R;
+import com.sap.sailing.android.buoy.positioning.app.valueobjects.CheckinData;
+import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.http.HttpGetRequest;
+import com.sap.sailing.android.shared.logging.ExLog;
+import com.sap.sailing.android.shared.ui.activities.CheckinDataActivity;
+import com.sap.sailing.android.shared.util.NetworkHelper;
+import com.sap.sailing.android.shared.util.UniqueDeviceUuid;
+import com.sap.sailing.domain.common.racelog.tracking.DeviceMappingConstants;
+import com.sap.sailing.domain.racelogtracking.DeviceIdentifier;
+import com.sap.sailing.domain.racelogtracking.impl.SmartphoneUUIDIdentifierImpl;
+
+public class CheckinManager {
+
+    private final static String TAG = CheckinManager.class.getName();
+    private AbstractCheckinData checkinData;
+    private CheckinDataActivity activity;
+    private AppPreferences prefs;
+    private String url;
+
+    public CheckinManager(String url, CheckinDataActivity activity){
+        this.activity = activity;
+        this.url = url;
+        prefs = new AppPreferences(activity);
+    }
+
+    public void callServerAndGenerateCheckinData(){
+        Uri uri = Uri.parse(url);
+
+        // TODO: assuming scheme is http, is this valid?
+        String scheme = uri.getScheme();
+        if (scheme != "http" && scheme != "https") {
+            scheme = "http";
+        }
+
+        final URLData urlData = extractRequestParametersFromUri(uri, scheme);
+        if (urlData == null)
+        {
+            setCheckinData(null);
+            return;
+        }
+
+        activity.showProgressDialog(R.string.please_wait, R.string.getting_marks);
+
+        try {
+            HttpGetRequest getLeaderboardRequest = new HttpGetRequest(new URL(urlData.getLeaderboardUrl), activity);
+            getLeaderBoardFromServer(urlData, getLeaderboardRequest);
+
+        } catch (MalformedURLException e) {
+            ExLog.e(activity, TAG,
+                    "Error: Failed to perform checking due to a MalformedURLException: " + e.getMessage());
+        }
+    }
+
+    private URLData extractRequestParametersFromUri(Uri uri, String scheme) {
+        URLData urlData = new URLData();
+        urlData.uriStr = uri.toString();
+        urlData.server = scheme + "://" + uri.getHost();
+        urlData.port = (uri.getPort() == -1) ? 80 : uri.getPort();
+        urlData.hostWithPort = urlData.server + ":" + urlData.port;
+
+        String leaderboardNameFromQR = "";
+        try {
+            leaderboardNameFromQR = URLEncoder.encode(uri.getQueryParameter(DeviceMappingConstants.URL_LEADERBOARD_NAME), "UTF-8")
+                    .replace("+", "%20");
+        } catch (UnsupportedEncodingException e) {
+            ExLog.e(activity, TAG, "Failed to encode leaderboard name: " + e.getMessage());
+        } catch (NullPointerException e) {
+            ExLog.e(activity, TAG, "Invalid Barcode (no leaderboard-name set): " + e.getMessage());
+            Toast.makeText(activity, activity.getString(R.string.error_invalid_qr_code), Toast.LENGTH_LONG).show();
+            urlData = null;
+        }
+        if(urlData != null) {
+            urlData.leaderboardName = leaderboardNameFromQR;
+
+            urlData.deviceUuid = new SmartphoneUUIDIdentifierImpl(UUID.fromString(UniqueDeviceUuid
+                    .getUniqueId(activity)));
+
+            urlData.getLeaderboardUrl = urlData.hostWithPort + prefs.getServerLeaderboardPath(urlData.leaderboardName);
+        }
+        return urlData;
+    }
+
+    private void getLeaderBoardFromServer(final URLData urlData, HttpGetRequest getLeaderboardRequest) {
+        NetworkHelper.getInstance(activity).executeHttpJsonRequestAsnchronously(getLeaderboardRequest,
+                new NetworkHelper.NetworkHelperSuccessListener() {
+
+                    @Override
+                    public void performAction(JSONObject response) {
+                        // TODO Auto-generated method stub
+
+
+                        final String leaderboardName;
+
+                        try {
+                            leaderboardName = response.getString("name");
+                        } catch (JSONException e) {
+                            ExLog.e(activity, TAG, "Error getting data from call on URL: " + urlData.getLeaderboardUrl
+                                    + ", Error: " + e.getMessage());
+                            activity.dismissProgressDialog();
+                            displayAPIErrorRecommendRetry();
+                            return;
+                        }
+
+                        HttpGetRequest getMarksRequest;
+                        try {
+                            getMarksRequest = new HttpGetRequest(new URL(urlData.getMarkUrl), activity);
+                            getMarksFromServer(leaderboardName, getMarksRequest, urlData);
+                        } catch (MalformedURLException e1) {
+                            ExLog.e(activity,
+                                    TAG,
+                                    "Error: Failed to perform checking due to a MalformedURLException: "
+                                            + e1.getMessage());
+                        }
+                    }
+
+                }, new NetworkHelper.NetworkHelperFailureListener() {
+
+                    @Override
+                    public void performAction(NetworkHelper.NetworkHelperError e) {
+                        ExLog.e(activity, TAG, "Failed to get event from API: " + e.getMessage());
+                        activity.dismissProgressDialog();
+                        displayAPIErrorRecommendRetry();
+                    }
+                });
+    }
+    
+	private void getMarksFromServer(String leaderboardName,
+			HttpGetRequest getMarksRequest, URLData urlData) {
+		// TODO Auto-generated method stub
+		
+	}
+
+    private void saveCheckinDataAndNotifyListeners(URLData urlData, String leaderboardName) {
+        CheckinData data = new CheckinData();
+        data.leaderboardName = leaderboardName;
+        data.deviceUid = urlData.deviceUuid
+                .getStringRepresentation();
+        data.uriString = urlData.uriStr;
+        try {
+            data.setCheckinDigestFromString(urlData.uriStr);
+            activity.dismissProgressDialog();
+            setCheckinData(data);
+        } catch (UnsupportedEncodingException e) {
+            ExLog.e(activity,
+                    TAG,
+                    "Failed to get generate digest of qr-code string ("
+                            + urlData.uriStr + "). "
+                            + e.getMessage());
+            activity.dismissProgressDialog();
+            displayAPIErrorRecommendRetry();
+        } catch (NoSuchAlgorithmException e) {
+            ExLog.e(activity,
+                    TAG,
+                    "Failed to get generate digest of qr-code string ("
+                            + urlData.uriStr + "). "
+                            + e.getMessage());
+            activity.dismissProgressDialog();
+            displayAPIErrorRecommendRetry();
+        }
+    }
+
+    public void setCheckinData(AbstractCheckinData data){
+        checkinData = data;
+        activity.onCheckinDataAvailable(getCheckinData());
+    }
+
+    public AbstractCheckinData getCheckinData(){
+        return checkinData;
+    }
+
+    /**
+     * Shows a pop-up-dialog that informs the user than an API-call has failed and recommends a retry.
+     */
+    private void displayAPIErrorRecommendRetry() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setMessage(activity.getString(R.string.notify_user_api_call_failed));
+        builder.setCancelable(true);
+        builder.setPositiveButton(activity.getString(R.string.ok), new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.cancel();
+            }
+
+        });
+        AlertDialog alert = builder.create();
+        alert.show();
+        setCheckinData(null);
+    }
+
+    public interface CheckinDataHandler{
+    }
+
+    private class URLData{
+        public String uriStr;
+        public String server;
+        public int port;
+        public String hostWithPort;
+        public String checkinURLStr;
+        public String eventId;
+        public String leaderboardName;
+        public DeviceIdentifier deviceUuid;
+        public String getMarkUrl;
+        public String getLeaderboardUrl;
+
+        public URLData(){
+
+        }
+    }
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java
new file mode 100644
index 00000000000..4266d197380
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/CheckinData.java
@@ -0,0 +1,34 @@
+package com.sap.sailing.android.buoy.positioning.app.valueobjects;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+import com.sap.sailing.android.shared.data.AbstractCheckinData;
+import com.sap.sailing.android.shared.data.LeaderboardInfo;
+
+public class CheckinData extends AbstractCheckinData{
+	public String leaderboardName;
+	public String deviceUid;
+	public String uriString;
+	public String checkinDigest;
+
+	public void setCheckinDigestFromString(String checkinString)
+			throws UnsupportedEncodingException, NoSuchAlgorithmException {
+		MessageDigest md = MessageDigest.getInstance("SHA-256");
+		md.update(checkinString.getBytes("UTF-8"));
+		byte[] digest = md.digest();
+		StringBuffer buf = new StringBuffer();
+		for (byte byt : digest) {
+			buf.append(Integer.toString((byt & 0xff) + 0x100, 16).substring(1));
+		}
+		checkinDigest = buf.toString();
+	}
+	
+	public LeaderboardInfo getLeaderboard() {
+        LeaderboardInfo leaderboard = new LeaderboardInfo();
+        leaderboard.name = leaderboardName;
+        leaderboard.checkinDigest = checkinDigest;
+        return leaderboard;
+    }
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/Mark.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/Mark.java
new file mode 100644
index 00000000000..6f4f5df86de
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/Mark.java
@@ -0,0 +1,49 @@
+package com.sap.sailing.android.buoy.positioning.app.valueobjects;
+
+public class Mark {
+	
+	private int id;
+	private String name;
+	private String type;
+	private String className;
+	
+	public Mark(int id, String name, String type, String className){
+		setId(id);
+		setName(name);
+		setType(type);
+		setClassName(className);
+	}
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getClassName() {
+		return className;
+	}
+
+	public void setClassName(String className) {
+		this.className = className;
+	}
+	
+}
diff --git a/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkPing.java b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkPing.java
new file mode 100644
index 00000000000..790a45c3902
--- /dev/null
+++ b/mobile/com.sap.sailing.buoy.positioning/src/com/sap/sailing/android/buoy/positioning/app/valueobjects/MarkPing.java
@@ -0,0 +1,47 @@
+package com.sap.sailing.android.buoy.positioning.app.valueobjects;
+
+public class MarkPing {
+	private String type;
+	private String longitude;
+	private String lattitude;
+	private int unixType;
+	
+	public MarkPing(String type, String longitude, String lattitude, int unixType){
+		setType(type);
+		setLongitude(longitude);
+		setLattitude(lattitude);
+		setUnixType(unixType);
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getLongitude() {
+		return longitude;
+	}
+
+	public void setLongitude(String longitude) {
+		this.longitude = longitude;
+	}
+
+	public String getLattitude() {
+		return lattitude;
+	}
+
+	public void setLattitude(String lattitude) {
+		this.lattitude = lattitude;
+	}
+
+	public int getUnixType() {
+		return unixType;
+	}
+
+	public void setUnixType(int unixType) {
+		this.unixType = unixType;
+	}
+}
diff --git a/mobile/pom.xml b/mobile/pom.xml
index dceb689ef19..069aa8e6d97 100644
--- a/mobile/pom.xml
+++ b/mobile/pom.xml
@@ -16,6 +16,7 @@
 <!--
         <module>com.sap.sailing.racecommittee.app</module>
         <module>com.sap.sailing.android.shared</module>
+	<module>com.sap.sailing.adnroid.buoy.positioning.app</module>
         <module>com.sap.sailing.android.tracking.app</module>
 -->
     </modules>