Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into tRecord

.../api/group-chat-msg/server/modifiers/clearGroupChatMsg.js

bigbluebutton-html5/imports/startup/client/base.jsx

bigbluebutton-html5/imports/ui/components/app/component.jsx

bigbluebutton-html5/imports/ui/components/app/styles.scss

bigbluebutton-html5/imports/ui/components/chat/service.js

...luebutton-html5/imports/ui/components/media/container.jsx

...button-html5/imports/ui/components/settings/component.jsx

...ui/components/settings/submenus/application/component.jsx

...ui/components/settings/submenus/application/container.jsx

bigbluebutton-html5/private/config/settings.yml

bigbluebutton-html5/private/locales/en.json