Merge remote-tracking branch 'upstream/master' into hidden_closedCaption

...ton-html5/imports/api/shapes/server/modifiers/addShape.js

bigbluebutton-html5/imports/startup/client/intl.js

bigbluebutton-html5/imports/startup/server/index.js

...luebutton-html5/imports/startup/server/userPermissions.js

...mports/ui/components/actions-bar/emoji-menu/component.jsx

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

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

bigbluebutton-html5/imports/ui/components/chat/container.jsx

...ml5/imports/ui/components/chat/message-form/component.jsx

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

...n-html5/imports/ui/components/dropdown/list/component.jsx

...l5/imports/ui/components/dropdown/list/item/component.jsx

...5/imports/ui/components/dropdown/list/title/component.jsx

...tml5/imports/ui/components/dropdown/trigger/component.jsx

...rts/ui/components/nav-bar/settings-dropdown/component.jsx

...ml5/imports/ui/components/notifications-bar/container.jsx

.../ui/components/presentation/default-content/component.jsx

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

...ton-html5/imports/ui/components/user-avatar/component.jsx

...orts/ui/components/user-list/chat-list-item/component.jsx