Modification de la liste de message
Merge branch 'master' of https://github.com/Dexedrine/myteammate.git

Conflicts:
	MyTeamMate/src/MTM/DesignBundle/Resources/public/css/style.css
Merge branch 'master' of https://github.com/Dexedrine/myteammate.git
Modification des messages
Merge branch 'master' of https://github.com/Dexedrine/myteammate.git

Conflicts:
	MyTeamMate/src/MTM/CoreBundle/Entity/TeamMate.php
Merge branch 'master' of https://github.com/Dexedrine/myteammate.git
Modification des messages : visuel