Fixed a few bugs.
Merge branch 'staging' of github.com:scrollback/scrollback into staging

Conflicts:
	public/sdk/factory.js