Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Etna/SocialBundle/Resources/config/routing.yml
	src/Etna/SocialBundle/Resources/views/Pages/profile.html.twig
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Etna/SocialBundle/Resources/config/routing.yml
Creation de Statut terminée
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Etna/SocialBundle/Resources/config/routing.yml
Modif statut