Strings erneut geändert
Merge branch 'master' of https://github.com/gundermann/SmartKichten_Ingredients.git
Layout
Merge branch 'master' of
https://github.com/gundermann/SmartKichten_Ingredients.git

Conflicts:
	Smart_Kitchen_Ingredients/res/layout/activity_add_ingredient.xml
	Smart_Kitchen_Ingredients/res/layout/shopping_date.xml