Revoir Statuts
Merge remote-tracking branch 'origin/master'
Commit pour pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Etna/SocialBundle/Resources/config/routing.yml
	src/Etna/SocialBundle/Resources/views/Pages/profile.html.twig
Affichage statut (Entre en dur pour le moment)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Etna/SocialBundle/Resources/config/routing.yml
	src/Etna/SocialBundle/Resources/views/Pages/profile.html.twig