Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into shared-notes-message-limit

...ton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties

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

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/layout.xml

...on-client/src/org/bigbluebutton/core/BreakoutTimerUtil.as

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

...client/src/org/bigbluebutton/main/views/LogoutWindow.mxml

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

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

...tton/modules/sharednotes/views/SharedNotesNameWindow.mxml

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

...igbluebutton/modules/users/views/RoomActionsRenderer.mxml

...rc/org/bigbluebutton/modules/users/views/UsersWindow.mxml

...luebutton/modules/whiteboard/views/WhiteboardToolbar.mxml

...ayback/presentation/playback/presentation/2.0/playback.js

...and-playback/presentation/scripts/publish/presentation.rb