jugs-updates
Merge branch 'master' into version/jugs

Conflicts:
	css/content.less
	css/cover.less
	stylesheet.css