Merge branch 'master' into ubilabs--buoy_positioning_app--develop

Conflicts:
	java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sse.gwt.theme/SSETheme_GWT sdm.launch
	java/com.sap.sse.gwt.theme/SSETheme_GWT.launch

mobile/com.sap.sailing.android.shared/pom.xml

@@ -26,6 +26,13 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.sap.sailing</groupId>
+            <artifactId>com.sap.sse.shared.android</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.sap.sailing</groupId>
             <artifactId>com.sap.sailing.server.gateway.serialization.shared.android</artifactId>

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SettingsActivity.java

@@ -101,4 +101,9 @@ public class SettingsActivity extends PreferenceActivity {
     public boolean isRedirected() {
         return isRedirectedToTemp;
     }
+    
+    @Override
+    protected boolean isValidFragment(String fragmentName) {
+        return true;
+    }
 }