avance 19.29
Merge branch 'Juan-Antonio' into Idar
Revert ec6f373..5a96192

This rolls back to commit ec6f37379c25938fc4cd5b73c05e0428b6eda81b.
Commit 15.00
Merge branch 'Idar' into Develop-Maquetas

Conflicts:
	css/pyxis.css
	less/dropdowns.less
	less/interaccion.less
	less/layout.less
	less/variables.less
	pagina-agenda.html