fixes
Merge branch 'master' of https://github.com/Kreyo/messaging-based-on-symfony

Conflicts:
	src/Trivia/MessengerBundle/Controller/UserController.php