edit alimentation
Merge branch 'master' of https://github.com/yoanngern/newsroom14

Conflicts:
	src/comem/NewsroomBundle/Resources/views/Theme/vetements.html.twig
merge