Merge tag 'uno' into develop

1.0 uno
Merge tag '1.0' into develop

solucion de problemas 1.0
jfvsldkfjlj
Merge branch 'release/dos'