Merge branch 'YOSHUA-CHIDO'
Delete v1
Delete v2
Version estable 1.2
Merge branch 'master' into YOSHUA-CHIDO