Merge
Merge branch 'master' of
git@github.com:gundermann/SmartKichten_Ingredients.git

Conflicts:
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/shoppinglist/ShoppingActivity.java