Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C

bbb-api-demo/src/main/webapp/demo_iframe.jsp

...orts/api/users-settings/server/methods/addUserSettings.js

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

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

...button-html5/imports/ui/components/actions-bar/service.js

.../imports/ui/components/audio/audio-controls/component.jsx

.../imports/ui/components/audio/audio-controls/container.jsx

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

...uebutton-html5/imports/ui/services/audio-manager/index.js

bigbluebutton-html5/private/config/settings.yml