Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

...-html5/imports/api/log-client/server/methods/logClient.js

...tton-html5/imports/api/presentation-upload-token/index.js

...rts/api/presentation-upload-token/server/eventHandlers.js

...load-token/server/handlers/presentationUploadTokenFail.js

...load-token/server/handlers/presentationUploadTokenPass.js

...ml5/imports/api/presentation-upload-token/server/index.js

...5/imports/api/presentation-upload-token/server/methods.js

...ad-token/server/methods/requestPresentationUploadToken.js

...mports/api/presentation-upload-token/server/publishers.js

...ebutton-html5/imports/api/presentations/server/methods.js

...ts/api/presentations/server/methods/removePresentation.js

...ports/api/presentations/server/methods/setPresentation.js

...mponents/presentation/presentation-uploader/container.jsx

.../components/presentation/presentation-uploader/service.js

...nt/user-participants/user-list-item/user-name/styles.scss

bigbluebutton-html5/private/config/settings-development.json

bigbluebutton-html5/private/config/settings-production.json

bigbluebutton-html5/server/main.js