Merge branch 'Beta-1.0' into Idar
tercero

commt de prueba
Merge branch 'Beta-1.0' into Gabriela
Merge branch 'Juan' into Beta-1.0

Conflicts:
	css/lgg.css
Merge branch 'Beta-1.0' of https://github.com/eadpucv/LGG into Beta-1.0

Conflicts:
	css/lgg.css
tipografía
Commit prueba 1
Commit prueba Idar-Juan
Merge branch 'Idar' into Juan

Conflicts:
	css/lgg.css
Merge branch 'Juan' into Idar
Ajuste funcional
Merge branch 'Juan' into Gabriela

Conflicts:
	css/lgg.css
Merge branch 'Juan' into Gabriela

Conflicts:
	css/lgg.css
Merge branch 'Beta-1.0' into Gabriela

Conflicts:
	css/lgg.css
	less/auxiliares.less
	less/interaccion.less
Merge branch 'Juan' into Beta-1.0

Conflicts:
	css/lgg.css
	less/interaccion.less
Grilla + Tipo + Forms
Commit de prueba 2
Merge branch 'Beta-1.0' into Idar

Conflicts:
	css/lgg.css
Merge branch 'Beta-1.0' into Gabriela

Conflicts:
	css/lgg.css
	less/auxiliares.less
	less/interaccion.less
Re-estructuración formularios

Se re-arman los formularios según la nueva grilla y además se ordenan
para que las columnas vayan dándole la forma.