Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat

...ore/apps/presentation/GetPresentationInfoReqMsgHdlr.scala

...bluebutton/core/apps/presentation/PresentationApp2x.scala

...core/apps/presentation/RemovePresentationPubMsgHdlr.scala

.../apps/presentation/SetCurrentPresentationPubMsgHdlr.scala

...tton/core/apps/presentationpod/PresentationPodHdlrs.scala

...e/apps/presentationpod/RemovePresentationPubMsgHdlr.scala

...cala/org/bigbluebutton/core/models/PresentationPods.scala

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

...ala/org/bigbluebutton/common2/msgs/PresentationMsgs.scala

...org/bigbluebutton/common2/msgs/PresentationPodsMsgs.scala

bigbluebutton-client/resources/config.xml.template

...nt/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as

...src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml

...g/bigbluebutton/modules/chat/maps/ChatEventMapDelegate.as

...rg/bigbluebutton/modules/present/business/PresentProxy.as

...bigbluebutton/modules/present/events/PresenterCommands.as

...ebutton/modules/present/events/RemovePresentationEvent.as

.../bigbluebutton/modules/present/managers/PresentManager.as

...org/bigbluebutton/modules/present/model/PresentOptions.as

...button/modules/present/model/PresentationWindowManager.as