Avancement matière+formation
Matiere + formation
Merge branch 'master' of https://github.com/debflav/scrum

Conflicts:
	app/Resources/views/nav.html.twig
	src/Override/ScrumBundle/Resources/views/Formation/index.html.twig