suppression du code
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/NAE/PlateformBundle/Resources/views/Expo/index.html.twig
	web/bundles/naeplateform/css/style.css