Updated Database
Merge remote-tracking branch 'origin/master'

Conflicts:
	RecipeManager/RecipeManager.Data/RecipeManagerData.edmx