- fix merge issues

akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala

@@ -49,7 +49,7 @@ object Boot extends App with SystemConfiguration {
   outgoingEventBus.subscribe(recorderActor, "outgoingMessageChannel")
   outgoingEventBus.subscribe(newMessageSenderActor, "outgoingMessageChannel")
 
-  val bbbInGW = new BigBlueButtonInGW(system, recorderApp, msgSender)
+  val bbbInGW = new BigBlueButtonInGW(system, eventBus, outGW)
   val redisMsgReceiver = new RedisMessageReceiver(bbbInGW)
 
   val redisSubscriberActor = system.actorOf(AppsRedisSubscriberActor.props(redisMsgReceiver), "redis-subscriber")

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomModel.scala

@@ -29,8 +29,8 @@ class BreakoutRoomModel {
     rooms.get(id)
   }
 
-  def getRooms() {
-    rooms
+  def getRooms(): Array[BreakoutRoom] = {
+    rooms.values.toArray
   }
 
   def getAssignedUsers(breakoutId: String): Option[Vector[String]] = {