Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router

.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

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

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

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

...on-html5/imports/ui/components/presentation/component.jsx

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

...omponents/presentation/presentation-overlay/component.jsx

...rts/ui/components/user-list/user-list-content/styles.scss

...er-list/user-list-content/user-participants/component.jsx

...list-content/user-participants/user-options/component.jsx

...list-content/user-participants/user-options/container.jsx

...r-list-content/user-participants/user-options/styles.scss

...ui/components/whiteboard/whiteboard-toolbar/component.jsx

...ui/components/whiteboard/whiteboard-toolbar/container.jsx