merge with master

...b/src/main/java/org/bigbluebutton/api/MeetingService.java

bigbluebutton-html5/client/main.jsx

...luebutton-html5/imports/api/polls/server/eventHandlers.js

...-html5/imports/api/polls/server/handlers/userResponded.js

bigbluebutton-html5/imports/api/polls/server/methods.js

...ton-html5/imports/api/polls/server/methods/publishPoll.js

...utton-html5/imports/api/polls/server/methods/startPoll.js

...button-html5/imports/api/polls/server/methods/stopPoll.js

...utton-html5/imports/api/polls/server/modifiers/addPoll.js

bigbluebutton-html5/imports/api/polls/server/publishers.js

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

...ton-html5/imports/ui/components/actions-bar/component.jsx

...ton-html5/imports/ui/components/actions-bar/container.jsx

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

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

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

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

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

...on-html5/imports/ui/components/error-screen/component.jsx

...luebutton-html5/imports/ui/components/media/component.jsx