Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-Imp-poll-result

...button-client/resources/prod/lib/bbb_webrtc_bridge_sip.js

bigbluebutton-html5/.gitignore

bigbluebutton-html5/imports/api/audio/client/bridge/sip.js

...uebutton-html5/imports/api/breakouts/server/publishers.js

...luebutton-html5/imports/api/meetings/server/publishers.js

...orts/api/screenshare/server/modifiers/clearScreenshare.js

...luebutton-html5/imports/api/users/server/eventHandlers.js

...on-html5/imports/api/users/server/handlers/userEjected.js

...n-html5/imports/api/users/server/modifiers/userEjected.js

bigbluebutton-html5/imports/api/users/server/publishers.js

bigbluebutton-html5/imports/startup/client/base.jsx

...-html5/imports/ui/components/activity-check/component.jsx

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

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

bigbluebutton-html5/imports/ui/components/audio/service.js

...n-html5/imports/ui/components/breakout-room/component.jsx

...s/ui/components/external-video-player/modal/component.jsx

...rts/ui/components/external-video-player/modal/styles.scss

...n-html5/imports/ui/components/meeting-ended/component.jsx

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