update
Merge branch 'new'

Conflicts:
	css/front/frontend.css