Merge branch 'Beta-1.0' into Juan
fondo y +
Merge branch 'Beta-1.0' into Juan

Conflicts:
	css/lgg.css
Merge branch 'Juan' into Beta-1.0