Avance 17.27
Commit para Juan 18:10
Merge branch 'Idar' into Juan-Antonio

Conflicts:
	css/pyxis.css