Merge branch 'Beta-1.0' into Juan
comit para idar
Revert "Merge branch 'Beta-1.0' into Idar"

Conflicts:
	css/lgg.css