Merge branch 'Juan-Antonio' into Maquetas
Home + Articulo Historia + Articulo
Merge branch 'Juan-Antonio' into Idar

Conflicts:
	css/pyxis.css
	less/layout.less
	pagina-noticia.html
Ajuste Juan + Idar
Merge branch 'Maquetas' of https://github.com/eadpucv/giornata into Maquetas
Merge branch 'Maquetas' into Juan-Antonio