Bug fixes
Merge branch 'master' of github.com:askabt/scrollback

Conflicts:
	client/sdk/ui.js