Layout avance
Merge branch 'Juan' into Beta-1.0

Conflicts:
	css/lgg.css