Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton

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

...nt/src/org/bigbluebutton/main/views/LanguageSelector.mxml

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

...rc/org/bigbluebutton/modules/chat/views/UserRenderer.mxml

...on-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as

bigbluebutton-config/bin/bbb-conf

record-and-playback/core/lib/recordandplayback.rb

record-and-playback/core/lib/recordandplayback/edl.rb

record-and-playback/core/lib/recordandplayback/edl/audio.rb

record-and-playback/core/lib/recordandplayback/edl/video.rb

...d-playback/core/lib/recordandplayback/generators/audio.rb

.../core/lib/recordandplayback/generators/audio_processor.rb

...-playback/core/lib/recordandplayback/generators/events.rb

...d-playback/core/lib/recordandplayback/generators/video.rb

...k/presentation/playback/presentation/css/bbb.playback.css

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

record-and-playback/presentation/scripts/presentation.yml

...and-playback/presentation/scripts/process/presentation.rb

...and-playback/presentation/scripts/publish/presentation.rb