Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton

bigbluebutton-client/resources/prod/BigBlueButton.html

bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js

bigbluebutton-client/src/WebcamPreviewStandalone.mxml

...utton-client/src/org/bigbluebutton/core/EventConstants.as

bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as

...rg/bigbluebutton/core/events/GetMyUserInfoRequestEvent.as

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

...client/src/org/bigbluebutton/main/api/ExternalApiCalls.as

.../org/bigbluebutton/main/api/maps/ExternalApiEventMap.mxml

...c/org/bigbluebutton/main/events/SwitchedPresenterEvent.as

...rc/org/bigbluebutton/main/model/BigBlueButtonPreloader.as

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

.../src/org/bigbluebutton/main/model/users/UsersSOService.as

...-client/src/org/bigbluebutton/main/views/MicSettings.mxml

.../src/org/bigbluebutton/modules/broadcast/models/Stream.as

...igbluebutton/modules/broadcast/views/BroadcastWindow.mxml

...bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml

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

...rg/bigbluebutton/modules/layout/model/LayoutDefinition.as

...c/org/bigbluebutton/modules/notes/views/NoteRenderer.mxml