A few bug fixes to get the client in a running state and some Room configuration related changes
Merge branch 'development' of github.com:scrollback/scrollback into development