Merge remote-tracking branch 'origin/master' into image_fond

Conflicts:
	src/BAU/MainBundle/Resources/js/volets_mecaniques.js
Adding images
Merge remote-tracking branch 'origin/image_fond' into image_fond

Conflicts:
	src/BAU/MainBundle/Resources/js/volets_mecaniques.js