Merge remote-tracking branch 'upstream/master' into network-indicator

akka-bbb-apps/.scalariform.conf

akka-bbb-apps/build.sbt

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala

...n/scala/org/bigbluebutton/core/OutMessageGatewayImp.scala

...ain/scala/org/bigbluebutton/core/apps/BreakoutModel.scala

...rc/main/scala/org/bigbluebutton/core/apps/GuestsApp.scala

.../org/bigbluebutton/core/apps/breakout/BreakoutApp2x.scala

...igbluebutton/core/apps/breakout/BreakoutHdlrHelpers.scala

...utton/core/apps/breakout/BreakoutRoomCreatedMsgHdlr.scala

...on/core/apps/breakout/CreateBreakoutRoomsCmdMsgHdlr.scala

...la/org/bigbluebutton/core/apps/caption/CaptionApp2x.scala

...in/scala/org/bigbluebutton/core/apps/chat/ChatApp2x.scala

...n/core/apps/groupchats/CreateDefaultPublicGroupChat.scala

...ton/core/apps/groupchats/GetGroupChatMsgsReqMsgHdlr.scala

...g/bigbluebutton/core/apps/groupchats/GroupChatHdlrs.scala

...on/core/apps/groupchats/SendGroupChatMessageMsgHdlr.scala

...gbluebutton/core/apps/layout/BroadcastLayoutMsgHdlr.scala

...ebutton/core/apps/layout/GetCurrentLayoutReqMsgHdlr.scala

...cala/org/bigbluebutton/core/apps/layout/LayoutApp2x.scala

...n/core/apps/meeting/ValidateConnAuthTokenSysMsgHdlr.scala