Merge remote-tracking branch 'upstream/master' into screenshare-error-notifications

...nding/default/style/css/assets/images/bbb_pc_chrome_2.png

bigbluebutton-client/locale/en_US/bbbResources.properties

...n-client/src/org/bigbluebutton/main/views/MainCanvas.mxml

...c/org/bigbluebutton/modules/caption/views/OptionsTab.mxml

...nt/src/org/bigbluebutton/modules/caption/views/TextTab.as

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

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

...uebutton-html5/imports/ui/components/modals/component.jsx

...5/imports/ui/components/modals/settings/SettingsModal.jsx

...html5/imports/ui/components/modals/settings/component.jsx

...n-html5/imports/ui/components/modals/settings/styles.scss

...i/components/modals/settings/submenus/ApplicationMenu.jsx

...orts/ui/components/modals/settings/submenus/AudioMenu.jsx

...orts/ui/components/modals/settings/submenus/UsersMenu.jsx

...orts/ui/components/modals/settings/submenus/VideoMenu.jsx

...onents/modals/settings/submenus/application/component.jsx

...i/components/modals/settings/submenus/audio/component.jsx

...ui/components/modals/settings/submenus/base/component.jsx

...components/modals/settings/submenus/session/component.jsx

...mports/ui/components/modals/settings/submenus/styles.scss