Merge branch 'develop'
Merge branch 'master' into develop
poder modificar el intervalo de salto de slides