Merge branch 'master' of https://github.com/rubinoske/Comfort-Food

Conflicts:
	api/dao/RecipesDAO.php
Merge branch 'master' of https://github.com/rubinoske/Comfort-Food

Conflicts:
	api/dao/RecipesDAO.php