Changed session cookie name to sbsid
Merge branch 'staging' of github.com:scrollback/scrollback into staging
Merge branch 'staging' of github.com:scrollback/scrollback into staging

Conflicts:
	http/socket.js
Merged admin-notifier log file change (minor)
Fixed an issue with msg rendering into items array, changed width of
room control buttons
Fixed /dlg/cookie on the request that sets it.
Synthetic scrolling
Merge branch 'staging' of github.com:scrollback/scrollback into staging