Deprecation getEntityManager() -> getManager()
Depreciation getDefaultOptions() -> setDefaultOptions()
maj fichier delete
maj translation & dashboard
Merge branch 'master' of https://github.com/orchestraLight/orchestraLight

Conflicts:
	src/Orchestra/Projet/ProjetBundle/Controller/RecetteController.php
	src/Orchestra/Projet/ProjetBundle/Entity/Recette.php
	src/Orchestra/Projet/ProjetBundle/Resources/views/Recette/edit.html.twig
	src/Orchestra/Projet/ProjetBundle/Resources/views/Recette/new.html.twig
Merge branch 'master' of https://github.com/orchestraLight/orchestraLight