Merge branch 'master' with bbb-mconf

...src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala

...c/main/scala/org/bigbluebutton/core/apps/UsersModel.scala

...rg/bigbluebutton/common/messages/RegisterUserMessage.java

bbb-common-web/src/test/resources/include-recording.ftlx

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

...lt/style/css/assets/images/almost_strong_audio_status.png

...ault/style/css/assets/images/almost_weak_audio_status.png

...g/default/style/css/assets/images/strong_audio_status.png

...ing/default/style/css/assets/images/weak_audio_status.png

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/BigBlueButton.html

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

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

...button-client/resources/prod/lib/bbb_webrtc_bridge_sip.js

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

...uebutton-client/resources/prod/lib/webrtc_stats_bridge.js

...nt/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as

...tton-client/src/org/bigbluebutton/main/events/BBBEvent.as

...rc/org/bigbluebutton/main/views/AudioSelectionWindow.mxml