Merge branch 'development' of github.com:scrollback/scrollback into deve

        Conflicts:
            public/client.html