Merge remote-tracking branch 'upstream/master' into sort-raisehand-better

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

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

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

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

...ference/service/participants/ParticipantsApplication.java

.../conference/service/participants/ParticipantsService.java

.../bigbluebutton/conference/service/voice/VoiceService.java

...n/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java

...ebconference/voice/FreeswitchConferenceEventListener.java

...tton/webconference/voice/freeswitch/ESLEventListener.java

...main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala

...rc/main/scala/org/bigbluebutton/core/CollectorActor.scala

.../src/main/scala/org/bigbluebutton/core/MeetingActor.scala

...rc/main/scala/org/bigbluebutton/core/api/InMessages.scala

...c/main/scala/org/bigbluebutton/core/api/OutMessages.scala

...in/scala/org/bigbluebutton/core/apps/users/UsersApp.scala

...in/scala/org/bigbluebutton/core/apps/voice/VoiceApp.scala

...la/org/bigbluebutton/core/apps/voice/VoiceInGateway.scala

...a/org/bigbluebutton/freeswitch/FreeswitchConference.scala

.../bigbluebutton/freeswitch/FreeswitchConferenceActor.scala