Merge remote-tracking branch 'upstream/master' into close

...uebutton-client/branding/default/style/css/BBBDefault.css

...on-client/src/org/bigbluebutton/common/CustomMdiWindow.as

...nt/src/org/bigbluebutton/main/model/users/BreakoutRoom.as

...ient/src/org/bigbluebutton/main/model/users/Conference.as

...bigbluebutton/modules/layout/events/LayoutChangedEvent.as

...rg/bigbluebutton/modules/layout/managers/LayoutManager.as

...g/bigbluebutton/modules/users/services/MessageReceiver.as

.../bigbluebutton/modules/users/views/MediaItemRenderer.mxml

...igbluebutton/modules/users/views/RoomActionsRenderer.mxml

...rc/org/bigbluebutton/modules/users/views/UsersWindow.mxml

...g/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml

.../org/bigbluebutton/modules/videoconf/views/VideoDock.mxml

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

...tml5/imports/ui/components/dropdown/content/component.jsx

...ton-html5/imports/ui/components/dropdown/list/styles.scss

...uebutton-html5/imports/ui/components/dropdown/styles.scss

bigbluebutton-html5/private/locales/en.json

record-and-playback/core/scripts/README

record-and-playback/core/scripts/bigbluebutton.yml

record-and-playback/core/scripts/rap-archive-worker.rb