Merge branch 'master' of https://github.com/esenator/recipes

Conflicts:
	Recipes/views.py