Merge branch 'Beta-1.0' into Catalina
LGG
Cambios layout.html
Merge branch 'Catalina' into Beta-1.0

Conflicts:
	iconografia.html