Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C

bigbluebutton-html5/client/main.jsx

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

...imports/ui/components/authenticated-handler/component.jsx

...on-html5/imports/ui/components/join-handler/component.jsx

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