possibilité d'ajouter des personnes dans une conversation
Merge branch 'master' of https://github.com/LaBrush/KUB

Conflicts:
	src/Kub/CollaborationBundle/Resources/views/Projet/edit.html.twig
	src/Kub/EDTBundle/Resources/views/EDT/show.html.twig
	src/Kub/MessagerieBundle/Resources/views/Conversation/show.html.twig
	src/Kub/RessourceBundle/Resources/views/Default/index.html.twig