merge conflicts

bigbluebutton-client/locale/en_US/bbbResources.properties

...luebutton-html5/imports/ui/components/about/component.jsx

.../ui/components/actions-bar/actions-dropdown/component.jsx

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

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

bigbluebutton-html5/imports/ui/components/app/component.jsx

...ts/ui/components/audio-modal/audio-settings/component.jsx

...mports/ui/components/audio-modal/join-audio/component.jsx

...l5/imports/ui/components/audio-notification/component.jsx

...tton-html5/imports/ui/components/audio-test/component.jsx

...ts/ui/components/breakout-join-confirmation/component.jsx

bigbluebutton-html5/imports/ui/components/chat/component.jsx

...ml5/imports/ui/components/chat/message-form/component.jsx

...ml5/imports/ui/components/chat/message-list/component.jsx

...ponents/chat/message-list/message-list-item/component.jsx

...button-html5/imports/ui/components/dropdown/component.jsx

...n-html5/imports/ui/components/dropdown/list/component.jsx

...ton-html5/imports/ui/components/enter-audio/component.jsx

...on-html5/imports/ui/components/error-screen/component.jsx

...5/imports/ui/components/logout-confirmation/component.jsx