Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into bbb-2x-mconf

...uebutton-client/branding/default/style/css/BBBDefault.css

...efault/style/css/assets/images/multiuserwhiteboardoff.png

...default/style/css/assets/images/multiuserwhiteboardon.png

bigbluebutton-client/src/org/bigbluebutton/common/Images.as

...ent/src/org/bigbluebutton/common/assets/images/Cursor.png

.../org/bigbluebutton/common/assets/images/administrator.gif

...src/org/bigbluebutton/common/assets/images/annotation.png

...rg/bigbluebutton/common/assets/images/application_put.png

...src/org/bigbluebutton/common/assets/images/arrow_left.png

.../src/org/bigbluebutton/common/assets/images/arrow_out.png

...rc/org/bigbluebutton/common/assets/images/arrow_right.png

...src/org/bigbluebutton/common/assets/images/arrow_undo.png

...lient/src/org/bigbluebutton/common/assets/images/chat.png

...ent/src/org/bigbluebutton/common/assets/images/circle.png

.../bigbluebutton/common/assets/images/control_play_blue.png

...ent/src/org/bigbluebutton/common/assets/images/eraser.png

.../src/org/bigbluebutton/common/assets/images/fill_icon.png

...rc/org/bigbluebutton/common/assets/images/fit-to-page.png

.../org/bigbluebutton/common/assets/images/fit-to-screen.png

...c/org/bigbluebutton/common/assets/images/fit-to-width.png