Merge remote-tracking branch 'origin/next' into

bsongis/Issue554_trims_relative_default

Conflicts:
	radio/src/gui/menu_model.cpp

radio/src/lcd.cpp

@@ -1155,7 +1155,7 @@ void putsTmrMode(xcoord_t x, uint8_t y, int8_t mode, LcdFlags att)
     return;
   }
 
-  if (mode >= TMR_VAROFS+MAX_PSWITCH+NUM_CSW) {
+  if (mode >= TMR_VAROFS+NUM_PSWITCH+NUM_CSW) {
     mode++;
   }