Merge branch 'Beta-1.0' into Juan
Grilla sin padding
Grilla + Code resuelto
Grillix

Soluciones
Merge branch 'Juan' into Beta-1.0
Class para márgenes columna

Layout
Merge branch 'Beta-1.0' into Idar

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