Modification des menus
Merge branch 'master' of https://github.com/psg93/intranet_psgV3

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.html.erb