Merge branch 'alarm-app-0.15'

apps/alarm/ChangeLog

@@ -13,3 +13,4 @@
       Widgets now shown on Alarm screen
 0.13: Alarm widget state now updates when setting/resetting an alarm
 0.14: Order of 'back' menu item
+0.15: Added missing menu 'back' in timer

apps/alarm/app.js

@@ -137,6 +137,7 @@ function editTimer(alarmIndex) {
   }
   const menu = {
     '': { 'title': /*LANG*/'Timer' },
+    /*LANG*/'< Back' : showMainMenu,
     /*LANG*/'Hours': {
       value: hrs,
       onchange: function(v){if (v<0)v=23;if (v>23)v=0;hrs=v;this.value=v;} // no arrow fn -> preserve 'this'