Further interface work
Merge branch 'master' into comparator_widgets

Conflicts:
	web/static/web/js/main.js
	web/templates/base.html
	web/templates/list/view.html