Utilisation de mailboxer officiel
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/messages_controller.rb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/messages_controller.rb