solving issues
Merge branch 'encrypted-recording' of https://github.com/mconf/bigbluebutton into encrypted-recording

Conflicts:
	record-and-playback/mconf/scripts/publish/mconf.rb