ajuste de rutas (menor)
Merge branch 'elDorado'
Merge branch 'master' into gh-pages