Merge branch 'master' into improve-html-style

Conflicts:
	templates/base.html
	templates/page.html