Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton

.../apps/users/UserJoinMeetingAfterReconnectReqMsgHdlr.scala

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/src/org/bigbluebutton/core/model/Me.as

...luebutton/main/model/modules/BigBlueButtonModuleLoader.as

.../org/bigbluebutton/main/model/modules/ModuleDescriptor.as

...igbluebutton/main/model/options/BrowserVersionsOptions.as

...c/org/bigbluebutton/main/model/options/SkinningOptions.as

...nt/src/org/bigbluebutton/main/model/users/BreakoutRoom.as

...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml

...org/bigbluebutton/modules/caption/model/CaptionOptions.as

...ebutton/modules/phone/views/components/ToolbarButton.mxml

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

...luebutton/modules/users/views/JoinBreakoutRoomWindow.mxml

...ports/api/voice-users/server/modifiers/updateVoiceUser.js