Cambiado texto licencia
Merge branch 'feature/10' into v1_0
Merge branch 'v1_0' into v2_0