Connect recipes filter with services
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/models/Recipe.js
Merge branch 'master' of https://github.com/Telerik-Hackathon-2014/YourFood