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

...in/java/org/bigbluebutton/app/video/VideoApplication.java

...rs/org/bigbluebutton/web/controllers/ApiController.groovy

...on-web/src/java/org/bigbluebutton/api/MeetingService.java

...b/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java

...on-web/src/java/org/bigbluebutton/api/domain/Meeting.java

...rg/bigbluebutton/api/messaging/RedisMessagingService.java

...nd-playback/core/lib/recordandplayback/events_archiver.rb

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

...-and-playback/simple/playback/simple/css/bbb.playback.css

...d-and-playback/simple/playback/simple/lib/jquery-1.4.4.js

...d-playback/simple/playback/simple/lib/jquery-1.4.4.min.js

record-and-playback/simple/playback/simple/logo.png

record-and-playback/simple/playback/simple/playback.html

record-and-playback/simple/playback/simple/playback.js