commit pour rien
Merge branch 'master' of ssh://git@github.com/YacineKhamis/CCLeclour.git

Conflicts:
	ApplicationLeclour/smarty/templates_c/20a5b87bf1d249a8e4b5bdf6dc560aa9c65c681a.file.header.tpl.php
	ApplicationLeclour/smarty/templates_c/ab7755c9dae14f847e3cac29631cc2ab39d09ffd.file.footer.tpl.php