Update
Merge branch 'master' of https://github.com/shked0wn/Gastro

Conflicts:
	src/Gastro/RecipeBookBundle/Resources/views/Recipe/form.html.twig