Modif menu, début nomenclature
Merge remote-tracking branch 'origin/master'

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

This reverts commit ef9f25a186f0f9f3c09a77d3ac5550d47467ca51.