Merge origin/master

Conflicts:
	src/test3/AddRecipeController.java
Merge origin/master

Conflicts:
	src/MealPlanner/recipes.xml
	src/test3/MakeRecipeController.java