Envoie de commentaire
Merge branch 'master' of https://github.com/Dexedrine/myteammate.git

Conflicts:
	MyTeamMate/src/MTM/ProfileBundle/Resources/views/Profile/others_profile.html.twig
	MyTeamMate/src/MTM/ProfileBundle/Resources/views/Profile/profile.html.twig