Two slides collided
Merge branch 'gh-pages' of github.com:Delawen/taller-geonetwork into gh-pages