Keine Änderungen
Merge branch 'master' of
https://github.com/gundermann/SmartKichten_Ingredients.git

Conflicts:
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/scheduling/ShoppingDateActivity.java
Merge branch 'master' of https://github.com/gundermann/SmartKichten_Ingredients.git
Merge branch 'master' of https://github.com/gundermann/SmartKichten_Ingredients.git
Strings und Layout Änderungen vorgenommen
Funktionaliät zur Erstellung mehrere Einkaufslisten erstellt.
Merge branch 'master' of
https://github.com/gundermann/SmartKichten_Ingredients.git

Conflicts:
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/localdata/IShoppingData.java
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/localdata/SmartKitchenData.java
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/shoppinglist/ShoppingListActivity.java
Zwischenstand
Activityaufrufe.
Merge remote-tracking branch 'origin/master' into multipleShoppingLists

Conflicts:
	Smart_Kitchen_Ingredients/res/values/strings.xml
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/collector/AddIngredientActivity.java
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/collector/IngredientCollectorActivity.java
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/collector/RecipeCollectorActivity.java
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/localdata/IShoppingData.java
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/localdata/SmartKitchenData.java
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/shoppinglist/ShoppingListActivity.java
	Smart_Kitchen_Ingredients/src/de/nordakademie/smart_kitchen_ingredients/shoppinglist/ShoppingListAdapter.java
Rezepte werden wieder übernommen