mere epic
Merge remote-tracking branch 'origin/master'

Conflicts:
	FoodPlanner/FoodPlanner/Views/SettingsPage.xaml
Merge branch 'master' of https://github.com/Helstedxd/FoodPlanner-Project