Commande
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/storage/logs/laravel.log
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 76fbdac90c7f48d76f1b516ee574866d70592f52.