changed Pre-Bolus label to 'Eating in' to make the behavior more clear, good idea @scottleibrand
Merge branch 'wip/time-adjust' into prod