todo update
Merge branch 'master' of https://github.com/FredrikEk/DrinkApp
Merge branch 'master' of https://github.com/FredrikEk/DrinkApp
favourite works and minor fixes
Merge branch 'master' of https://github.com/FredrikEk/DrinkApp