petit test
Merge remote-tracking branch 'test/master'

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