Added the mock-libsb-settingsttings.js file to client.html and fixed a
bug in settings-area.js
Merge branch 'development' of github.com:scrollback/scrollback into development

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

Conflicts:
	public/client.html