vidage
ajout version derek
Merge branch 'fusion' into develop