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
Ajuste funcional
Merge branch 'Beta-1.0' into Gabriela

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