Merge branch 'master' into add-avatar-to-stadalone-webcam-app

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

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/src/BigBlueButton.mxml

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

...c/org/bigbluebutton/main/views/CameraDisplaySettings.mxml

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

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

.../src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml

...nt/src/org/bigbluebutton/modules/chat/views/ChatView.mxml

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

bigbluebutton-config/check-localization-keys.txt