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

...luebutton/conference/ParticipantUpdatingRoomListener.java

.../main/java/org/bigbluebutton/conference/RoomsManager.java

...ebutton/conference/service/messaging/MessageListener.java

...button/conference/service/messaging/MessagingService.java

...luebutton/conference/service/messaging/RedisListener.java

...n/conference/service/messaging/RedisMessagingService.java

...uebutton/conference/service/messaging/RedisPublisher.java

bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml

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

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

...-and-playback/slides/playback/slides/css/bbb.playback.css

...d-playback/slides/playback/slides/lib/popcorn.timeline.js

record-and-playback/slides/playback/slides/playback.html