Merge branch 'master' into merge-master-into-dynamic-config

bbb-video/build.gradle

bbb-voice/build.gradle

bigbluebutton-apps/build.gradle

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

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

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

...bigbluebutton/modules/users/views/StatusItemRenderer.mxml

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

deskshare/app/build.gradle

deskshare/build.gradle