suite
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FrontOffice/OptimusBundle/Controller/MessageController.php

	src/FrontOffice/OptimusBundle/Resources/views/Message/conversationsShow.html.twig
	web/js/neon-chat.js