Commit Lunes 19.22
Merge branch 'Idar' into Juan-Antonio

Conflicts:
	css/pyxis.css
	less/layout.less