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

bigbluebutton-config/bin/bbb-conf

labs/applet-jni/README.txt

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

record-and-playback/deploy.sh

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

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

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

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

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

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