Merge branch 'Juan-Antonio' of https://github.com/eadpucv/giornata into Juan-Antonio

Conflicts:
css/pyxis.css
avance de Home
 solución dessincronizacion
Merge branch 'Develop-Maquetas' into Juan-Antonio

Conflicts:
	css/pyxis.css
Inclusión de página-resultado-de-búsqueda

+ avance home
Merge branch 'Juan-Antonio' into Develop-Maquetas

Conflicts:
	css/pyxis.css