Correccion de errores
Merge branch 'desarrollo' of https://github.com/juan1510/siasoft_v2
Merge branch 'master' of https://github.com/danieljulian9865/siasoft_v2 into desarrollo