Prise en charge des emails
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/FriendController.php
	app/controllers/UserController.php
	app/views/User/userPage.php