Merge branch 'Juan-Antonio' into Maquetas
Avances de maquetas de Bloques (Sab 19:42)
Merge branch 'Idar' into Maquetas

Conflicts:
	css/pyxis.css
	less/layout.less
	pagina-noticia.html
Sabado 19.43
Merge branch 'Maquetas' into Juan-Antonio