Fix merge conflicts

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

...s/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala

...ain/scala/org/bigbluebutton/core/MessageSenderActor.scala

.../main/scala/org/bigbluebutton/core/api/MessageNames.scala

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

...n/core/pubsub/senders/MeetingMessageToJsonConverter.scala

bbb-client-check/.gitignore

bbb-client-check/build.xml

bbb-client-check/resources/lib/api-bridge.js

bbb-client-check/resources/lib/bbb_webrtc_bridge_sip.js

bbb-client-check/resources/lib/sip.js

...g/bigbluebutton/common/messages/MeetingEndingMessage.java

...bigbluebutton/red5/client/MeetingClientMessageSender.java

...on-client/src/org/bigbluebutton/common/CustomMdiWindow.as

...-client/src/org/bigbluebutton/main/model/users/BBBUser.as

...ient/src/org/bigbluebutton/main/model/users/Conference.as

...rg/bigbluebutton/modules/layout/managers/LayoutManager.as

...org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml

.../bigbluebutton/modules/layout/services/MessageReceiver.as

...g/bigbluebutton/modules/users/services/MessageReceiver.as