Moved UI stuff to one object
Merge branch 'development' of github.com:scrollback/scrollback into development

Conflicts:
	public/client.html