8
clean

Conflicts:
	dev/css/style_common.less
	dev/index.html