Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 5 insertions, 2 deletions

diff --git a/src/displayapp/Apps.h b/src/displayapp/Apps.h
index 11401c3..358ea1f 100644
--- a/src/displayapp/Apps.h
+++ b/src/displayapp/Apps.h
@@ -2,7 +2,10 @@
 
 namespace Pinetime {
   namespace Applications {
-    enum class Apps {None, Launcher, Clock, SysInfo, Meter, Brightness, Music, FirmwareValidation,
-                      Paint, Paddle, Notifications, Twos, HeartRate, Navigation, StopWatch, Motion};
+    enum class Apps {
+      None, Launcher, Clock, SysInfo, FirmwareUpdate, FirmwareValidation, NotificationsPreview, Notifications, FlashLight, BatteryInfo,
+      Music, Paint, Paddle, Twos, HeartRate, Navigation, StopWatch, Motion,
+      QuickSettings, Settings, SettingWatchFace, SettingTimeFormat, SettingDisplay, SettingWakeUp
+    };
   }
 }