Merge remote-tracking branch 'upstream/master' into userlist_dot

bigbluebutton-config/bin/bbb-conf

bigbluebutton-html5/client/stylesheets/bbb-icons.css

bigbluebutton-html5/imports/locales/en.json

bigbluebutton-html5/imports/startup/server/logger.js

...ton-html5/imports/ui/components/actions-bar/component.jsx

...mports/ui/components/actions-bar/emoji-menu/component.jsx

...mports/ui/components/actions-bar/emoji-menu/container.jsx

...5/imports/ui/components/actions-bar/emoji-menu/service.js

...uebutton-html5/imports/ui/components/user-list/service.js

bigbluebutton-html5/imports/utils/statuses.js

bigbluebutton-html5/lib/environment.js

bigbluebutton-html5/package.json