Merge branch 'dev/temp' into webby

    Conflicts:
        ui/chat-area.js