remise au propre + slider
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/NAE/PlateformBundle/Resources/views/Expo/index.html.twig