Fixed choose of friends in messages
Merge branch 'master' into feature/FixBranch

Conflicts:
	src/BionicUniversity/Bundle/MessageBundle/Controller/Front/MessageController.php
Merge branch 'feature/FixBranch'
Merge branch 'master' of github.com:bionic-university/sparrow