Merge remote-tracking branch 'origin/dev2' into dev2

# Conflicts:
#	services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java

services/mogo-service-api/src/main/java/com/mogo/service/adas/IMogoADASController.java

@@ -144,7 +144,11 @@ public interface IMogoADASController extends IProvider {
 
     int getAutopilotStatus();
 
-    void mockOchStatus(int state, String reason);
+    void mockOchStatus( int state, String reason );
+
+    double getLastLat();
+
+    double getLastLon();
 
     void cancelAutopilot();
 }