Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into html5-tests-v3

bbb-api-demo/src/main/webapp/demo_iframe.jsp

...ton/presentation/imp/PdfToSwfSlidesGenerationService.java

...rts/ui/components/actions-bar/desktop-share/component.jsx

...utton-html5/imports/ui/components/actions-bar/styles.scss

.../imports/ui/components/audio/audio-controls/component.jsx

...l5/imports/ui/components/audio/audio-controls/styles.scss

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

...uebutton-html5/imports/ui/components/dropdown/styles.scss

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

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

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

...-html5/imports/ui/components/video-provider/component.jsx

...rts/ui/components/video-provider/video-menu/component.jsx

...ports/ui/components/video-provider/video-menu/styles.scss

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

...uebutton-html5/imports/ui/services/audio-manager/index.js

bigbluebutton-html5/private/locales/en.json