Merge branch 'feature/anne' into dev
add cancel in form equipe
add delete cascade
Merge branch 'feature/sami' into dev
Merge branch 'dev' of https://github.com/SamiErrighi/gladiator-scrum into feature/anne

Conflicts:
	src/User/Bundle/Resources/views/Profile/show_content.html.twig
Merge branch 'dev' of https://github.com/SamiErrighi/gladiator-scrum into dev
Merge branch 'dev' of https://github.com/SamiErrighi/gladiator-scrum into feature/anne