Merge branch piggz/nav into develop:

- fix conflict
 - add a icon for the navigation app.

src/components/ble/NimbleController.cpp

@@ -35,6 +35,7 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
         alertNotificationClient{systemTask, notificationManager},
         currentTimeService{dateTimeController},
         musicService{systemTask},
+        navService{systemTask},
         batteryInformationService{batteryController},
         immediateAlertService{systemTask, notificationManager},
         serviceDiscovery({&currentTimeClient, &alertNotificationClient}),
@@ -56,6 +57,7 @@ void NimbleController::Init() {
   currentTimeClient.Init();
   currentTimeService.Init();
   musicService.Init();
+  navService.Init();
   anService.Init();
   dfuService.Init();
   batteryInformationService.Init();