Merge pull request #101 from mercutiodesign/supplyfilter

Supply / Demand for recipes
added missing columns
Merge remote-tracking branch 'upstream/master'

Conflicts:
	templates/recipe_list.html.twig