Merge remote-tracking branch 'origin/develop' into u22-sadl1

bigbluebutton-html5/.gitignore

bigbluebutton-html5/imports/startup/client/intl.jsx

bigbluebutton-html5/imports/startup/server/index.js

...uebutton-html5/imports/ui/components/legacy/component.jsx

...i/components/media/webcam-draggable-overlay/component.jsx

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

...tml5/imports/ui/components/poll/dragAndDrop/component.jsx

...-html5/imports/ui/components/poll/dragAndDrop/styles.scss

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

...luebutton-html5/imports/ui/components/settings/service.js

bigbluebutton-html5/private/config/settings.yml

bigbluebutton-html5/public/locales/ar.json

bigbluebutton-html5/public/locales/az.json

bigbluebutton-html5/public/locales/bg_BG.json

bigbluebutton-html5/public/locales/ca.json

bigbluebutton-html5/public/locales/cs_CZ.json

bigbluebutton-html5/public/locales/da.json

bigbluebutton-html5/public/locales/de.json

bigbluebutton-html5/public/locales/el_GR.json

bigbluebutton-html5/public/locales/en.json