Merge remote-tracking branch 'Upstream/master' into start-poll-01

.nvmrc

.travis.yml

bigbluebutton-config/bin/bbb-conf

bigbluebutton-html5/.eslintignore

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

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

bigbluebutton-html5/imports/startup/client/auth.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

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

...tml5/imports/ui/components/chat/chat-dropdown/styles.scss