Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into logging-structure

bigbluebutton-config/bigbluebutton-release

...ton-html5/imports/api/users/server/handlers/userJoined.js

...5/imports/api/users/server/methods/userChangedSettings.js

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

.../imports/api/users/server/modifiers/setChangedSettings.js

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

...ton-html5/imports/ui/components/actions-bar/container.jsx

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

...s/ui/components/external-video-player/modal/component.jsx

...s/ui/components/external-video-player/modal/container.jsx

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

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

...components/video-provider/many-users-notify/container.jsx

...ebutton-html5/imports/ui/services/users-settings/index.js

bigbluebutton-html5/private/locales/en.json