Merge pull request #24 from daviddelon/dev

Integration de bachibouzouk dans la branche de dev
Correction probleme de fusion
Merge branch 'bachibouzouk' into dev
Recuperation extensions complementaires