Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into change-internaluserid

...ference/service/presentation/PresentationApplication.java

...ference/service/presentation/PresentationEventSender.java

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

...igbluebutton/modules/present/business/PresentSOService.as

...luebutton/modules/present/business/PresentationService.as

...bigbluebutton/modules/present/services/MessageReceiver.as

...g/bigbluebutton/modules/present/services/MessageSender.as

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