último avance Viernes 18:22
avance de grilla
Merge branch 'Juan' into Beta-1.0

Conflicts:
	css/lgg.css
	less/auxiliares.less