Merge origin/master

Conflicts:
	css/template.css
	css/template.css.map
	less/template.less