comit
Merge branch 'Idar' into Juan-Antonio
commit carousel home
Merge branch 'Idar' into Juan-Antonio

Conflicts:
	css/pyxis.css
	less/layout.less
Revert 76bfbf6..63656a2

This rolls back to commit 76bfbf6ee40d977701ac7674ed885e1829025f90.
Merge branch 'Juan-Antonio' into Maquetas