Merge remote-tracking branch 'upstream/master' into breakout-room-html5

bigbluebutton-html5/.meteor/packages

...luebutton-html5/client/compatibility/kurento-extension.js

bigbluebutton-html5/client/main.jsx

bigbluebutton-html5/imports/api/acl/Acl.js

...orts/api/users-settings/server/methods/addUserSettings.js

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

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

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

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

...utton-html5/imports/ui/components/actions-bar/styles.scss

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

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

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

...l5/imports/ui/components/audio/audio-controls/styles.scss

...html5/imports/ui/components/audio/audio-modal/styles.scss

...l5/imports/ui/components/audio/audio-settings/styles.scss

...-html5/imports/ui/components/audio/audio-test/styles.scss

...n-html5/imports/ui/components/audio/echo-test/styles.scss

...ports/ui/components/audio/permissions-overlay/styles.scss

...orts/ui/components/breakout-join-confirmation/styles.scss