fix merge conflict

bigbluebutton-client/locale/ar/bbbResources.properties

bigbluebutton-client/locale/fr_FR/bbbResources.properties

bigbluebutton-client/locale/id_ID/bbbResources.properties

bigbluebutton-client/locale/ru_RU/bbbResources.properties

bigbluebutton-client/locale/uk_UA/bbbResources.properties

bigbluebutton-client/locale/vi_VN/bbbResources.properties

bigbluebutton-client/src/org/bigbluebutton/common/Images.as

bigbluebutton-config/bigbluebutton-release

bigbluebutton-config/web/index.html

...luebutton-html5/imports/api/users/server/eventHandlers.js

...utton-html5/imports/api/users/server/handlers/kickUser.js

...utton-html5/imports/api/users/server/modifiers/addUser.js

...ml5/imports/api/users/server/modifiers/createDummyUser.js

...tton-html5/imports/api/users/server/modifiers/kickUser.js

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

.../ui/components/actions-bar/actions-dropdown/component.jsx

...ports/ui/components/actions-bar/mute-button/component.jsx

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

...orts/ui/components/audio/audio-notification/container.jsx

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