Merge branch 'master' into development
Permisos modificados
Actualización gitignore
Merge branch 'development'