Correction probleme de fusion
Merge branch 'bachibouzouk' into dev
Recuperation extensions complementaires
Merge pull request #26 from daviddelon/dev

Reintegration des extensions complementaires