Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton...

.../scala/org/bigbluebutton/core/apps/SharedNotesModel.scala

...ton/core/apps/sharednotes/ClearSharedNotePubMsgHdlr.scala

...igbluebutton/core/apps/sharednotes/SharedNotesApp2x.scala

...on/core/apps/sharednotes/UpdateSharedNoteReqMsgHdlr.scala

.../src/main/scala/org/bigbluebutton/core/models/Polls.scala

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala

...on/core/record/events/AddShapeWhiteboardRecordEvent.scala

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala

...ebutton/freeswitch/voice/freeswitch/ESLEventListener.java

bbb-api-demo/src/main/webapp/bbb_api.jsp

...cala/org/bigbluebutton/common2/msgs/SharedNotesMsgs.scala

bbb-common-web/build.sbt

bbb-common-web/scala/TestScalaXml.sc

...b/src/main/java/org/bigbluebutton/api/MeetingService.java

...src/main/java/org/bigbluebutton/api/RecordingService.java

.../java/org/bigbluebutton/api/domain/RecordingMetadata.java

...bigbluebutton/api/util/RecordingMetadataReaderHelper.java

.../main/java/org/bigbluebutton/api2/RecordingServiceGW.java

...n/scala/org/bigbluebutton/api2/RecordingServiceGW2x.scala

.../main/scala/org/bigbluebutton/api2/domain/Recording.scala