Fixed Issue #303
Merge branch 'hotfix-1.0.4' into develop

Conflicts:
	Seasoning/recipes/templates/recipes/edit_recipe_base.html