fix merge conflicts

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

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

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

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

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

bigbluebutton-html5/imports/ui/services/auth/index.js

bigbluebutton-html5/private/locales/bg_BG.json

bigbluebutton-html5/private/locales/de.json

bigbluebutton-html5/private/locales/en.json

bigbluebutton-html5/private/locales/pt_BR.json