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

    Conflicts:
        public/client.html