Merge branch 'release/3.0' into develop
Se corrigen problemas
Se cambia version
Merge branch 'release/3.1'