Merge branch 'Juan' into Beta-1.0

Conflicts:
	css/lgg.css
	less/interaccion.less
Grilla + Tipo + Forms
Merge branch 'Beta-1.0' into Gabriela

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