Bug de lang
Merge branch 'Samuel'
Formulaire avance
Merge branch 'Samuel'
corretion conflit merge