Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-pre-check

...c/org/bigbluebutton/main/views/CameraDisplaySettings.mxml

...client/src/org/bigbluebutton/main/views/MuteMeButton.mxml

...-client/src/org/bigbluebutton/main/views/VideoHolder.mxml

...bigbluebutton/modules/phone/managers/WebRTCCallManager.as

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