Merge branch 'overhaul' into development

Conflicts:
	public/client.html
	public/s/components/navigation.js
Merge branch 'development' of github.com:scrollback/scrollback into development

Conflicts:
	public/client.html