Merge branch 'Beta-1.0' into Catalina
Cambios strong en less y html iconografia
Merge branch 'Catalina' into Beta-1.0

Conflicts:
	css/lgg.css