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

bigbluebutton-client/branding/default/style/css/BBBBlack.css

bigbluebutton-client/build.xml

bigbluebutton-client/resources/config.xml.template

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

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

...igbluebutton/modules/videoconf/business/VideoWindowItf.as

...igbluebutton/modules/videoconf/events/UserTalkingEvent.as

...bigbluebutton/modules/videoconf/model/VideoConfOptions.as

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

.../bigbluebutton/modules/videoconf/views/PublishWindow.mxml

...rg/bigbluebutton/modules/videoconf/views/VideoWindow.mxml

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

.../presentation/acornmediaplayer/jquery.acornmediaplayer.js

...ion/acornmediaplayer/themes/darkglass/acorn.darkglass.css

...tion/acornmediaplayer/themes/darkglass/darkglass-swap.png

...layback/presentation/playback/presentation/lib/writing.js

...playback/presentation/playback/presentation/playback.html

...d-playback/presentation/playback/presentation/playback.js