Merge branch 'merge-polling-with-master' of...

Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master

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

@@ -26,7 +26,7 @@ require 'builder'
 require 'streamio-ffmpeg'
 require 'mime/types'
 require 'digest/md5'
-require 'zip/zip'
+require 'zip'
 
 module BigBlueButton
   class MediaFormatException < StandardError

record-and-playback/core/scripts/cleanup.rb

+#!/usr/bin/ruby
 #
 # BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
 #

record-and-playback/core/scripts/rap-worker.rb

+#!/usr/bin/ruby
 # Set encoding to utf-8
 # encoding: UTF-8