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

.../bigbluebutton/core/domain/MeetingInactivityTracker.scala

...rc/main/scala/org/bigbluebutton/core/models/Users2x.scala

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala

...scala/org/bigbluebutton/core2/testdata/FakeTestData.scala

bbb-webhooks/.dockerignore

bbb-webhooks/config.js

bbb-webhooks/messageMapping.js

bbb-webhooks/userMapping.js

bbb-webhooks/web_hooks.js

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

...luebutton-html5/imports/ui/components/audio/container.jsx

...luebutton-html5/imports/ui/components/media/container.jsx

...n-html5/imports/ui/components/video-preview/component.jsx

...n-html5/imports/ui/components/video-preview/container.jsx

...tton-html5/imports/ui/components/video-preview/service.js

...ton-html5/imports/ui/components/video-preview/styles.scss

...-html5/imports/ui/components/video-provider/component.jsx

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

...rts/ui/components/video-provider/video-menu/container.jsx

bigbluebutton-html5/private/locales/en.json