Merge branch 'master' into remove-client-side-acl

.travis.yml

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

...components/actions-bar/create-breakout-room/component.jsx

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

...nents/breakout-room/breakout-remaining-time/component.jsx

...nents/breakout-room/breakout-remaining-time/container.jsx

...n-html5/imports/ui/components/breakout-room/component.jsx

...n-html5/imports/ui/components/breakout-room/container.jsx

...tton-html5/imports/ui/components/breakout-room/service.js

...ton-html5/imports/ui/components/breakout-room/styles.scss

...n-html5/imports/ui/components/meeting-ended/component.jsx

bigbluebutton-html5/private/config/settings.yml