Merge branch 'webby' into reactclient

    Conflicts:
        public/client.html
        public/s/components/infinite.js
        public/s/components/people-area.js
        public/s/components/person.js
        public/s/js/mock-libsb.js
        public/s/lib/generate.js