Sinc
Merge branch 'Gabriela' into Beta-1.0

Conflicts:
	css/lgg.css
	less/type.less