pruebas en less
Merge branch 'develop' into Shorts.less

Conflicts:
	css/stampa.css
actualizacion stampa
Atajos para direccionales
Atajos se cambian en src
Merge branch 'develop' into Shorts.less
Se añade orden a shorts.less
Se elimina .less-old
Merge branch 'Shorts.less' into develop