Merge branch 'master' into merge-polling-with-master

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

bigbluebutton-client/locale/en_US/bbbResources.properties

...tton-client/resources/prod/lib/bbb_webrtc_bridge_jssip.js

bigbluebutton-client/resources/prod/lib/bigbluebutton.js

.../src/org/bigbluebutton/main/views/MicPermissionImage.mxml

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

.../bigbluebutton/modules/present/managers/PresentManager.as

...bluebutton/modules/present/ui/views/FileUploadWindow.mxml

...odules/present/ui/views/UploadedPresentationRenderer.mxml