Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/screens/settings/Settings.cpp

src/displayapp/Apps.h

@@ -37,7 +37,8 @@ namespace Pinetime {
       SettingSetDate,
       SettingSetTime,
       SettingChimes,
-      Error,
+      SettingShakeThreshold,
+      Error
     };
   }
 }