Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x

...igbluebutton/common/messages/UserSharedWebcamMessage.java

...tton/common/messages/UserUnshareWebcamRequestMessage.java

bigbluebutton-client/branding/default/style/css/V2Theme.css

...-client/branding/default/style/css/assets/swf/v2_skin.fla

...-client/branding/default/style/css/assets/swf/v2_skin.swf

...g/default/style/css/org/bigbluebutton/skins/ButtonSkin.as

...default/style/css/org/bigbluebutton/skins/ComboBoxSkin.as

...ault/style/css/org/bigbluebutton/skins/PopUpButtonSkin.as

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/logo.swf

...client/src/org/bigbluebutton/main/events/ShortcutEvent.as

...src/org/bigbluebutton/main/model/options/LayoutOptions.as

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

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

...ent/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml

...uebutton/modules/phone/views/components/MuteMeButton.mxml

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

...bluebutton/modules/present/ui/views/FileUploadWindow.mxml

...ton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml