Retab
Merge branch 'master' of https://github.com/guiben/Cuisinator

Conflicts:
	server/module_recette.py