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

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

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/prod/BigBlueButton.html

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

...lient/src/org/bigbluebutton/main/model/ShortcutOptions.as

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

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

...c/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml

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

...bigbluebutton/modules/users/views/StatusItemRenderer.mxml