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

akka-bbb-apps/project/Dependencies.scala

akka-bbb-apps/project/build.properties

akka-bbb-apps/project/plugins.sbt

...luebutton/core/apps/users/GetLockSettingsReqMsgHdlr.scala

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

akka-bbb-apps/src/templates/etc-default

akka-bbb-fsesl/build.sbt

akka-bbb-fsesl/project/Dependencies.scala

akka-bbb-fsesl/project/build.properties

akka-bbb-fsesl/project/plugins.sbt

akka-bbb-fsesl/run.sh

akka-bbb-fsesl/src/templates/etc-default

akka-bbb-fsesl/src/universal/conf/application.ini

akka-bbb-transcode/build.sbt

akka-bbb-transcode/project/Dependencies.scala

akka-bbb-transcode/project/build.properties

akka-bbb-transcode/project/plugins.sbt

akka-bbb-transcode/run.sh

...bbb-transcode/src/main/scala/org/bigbluebutton/Boot.scala

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala