Try catch around localstorage
Merge branch 'master' of github.com:scrollback/scrollback
Merge branch 'master' into staging

Conflicts:
	public/sdk/messageArray.js