Merge branch 'master' of https://github.com/YacineKhamis/CCLeclour

Conflicts:

	ApplicationLeclour/smarty/templates_c/425abec4c84c0b7b793d00d42d124339bf764e8c.file.identificationCarte.tpl.php
Merge branch 'master' of https://github.com/YacineKhamis/CCLeclour