Added drink and food preferences layout
Fix app name misspelling
notification tweaks
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/master'