Merge branch 'master' into breakout-room-html5

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

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

bigbluebutton-html5/imports/ui/components/app/styles.scss

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

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

...ebutton-html5/imports/ui/components/nav-bar/component.jsx

...rts/ui/components/nav-bar/settings-dropdown/component.jsx

...n-html5/imports/ui/components/shortcut-help/component.jsx

...ton-html5/imports/ui/components/shortcut-help/service.jsx

...orts/ui/components/user-list/chat-list-item/component.jsx

...ports/ui/components/video-provider/video-list/styles.scss

...ui/components/whiteboard/whiteboard-overlay/component.jsx

...oard/whiteboard-overlay/shape-draw-listener/component.jsx

...ui/components/whiteboard/whiteboard-toolbar/component.jsx

bigbluebutton-html5/package-lock.json

bigbluebutton-html5/package.json