Richard Alam
04c271996d
Merge branch 'broadcast-layout' of github.com:mconf/bigbluebutton into broadcast-layout
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutService.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as