Cambio menu inferior
Merge branch 'Beta-1.0' into Catalina

Conflicts:
	css/lgg.css
Cambio menu inferior
Cambios en menu de navegacion
Merge branch 'Catalina' into Beta-1.0