start adding templates
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/api/recipes/views.py
fix auth import