Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice

.travis.yml

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

bigbluebutton-html5/client/main.jsx

bigbluebutton-html5/imports/api/acl/Acl.js

...imports/api/annotations/server/methods/clearWhiteboard.js

.../imports/api/annotations/server/methods/sendAnnotation.js

.../imports/api/annotations/server/methods/undoAnnotation.js

...button-html5/imports/api/annotations/server/publishers.js

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

...uebutton-html5/imports/api/breakouts/server/publishers.js

...luebutton-html5/imports/api/captions/server/publishers.js

.../imports/api/cursor/server/methods/publishCursorUpdate.js

...button-html5/imports/api/group-chat-msg/server/methods.js

...ton-html5/imports/api/group-chat-msg/server/publishers.js

bigbluebutton-html5/imports/api/group-chat/server/methods.js

...ebutton-html5/imports/api/group-chat/server/publishers.js

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

...luebutton-html5/imports/api/meetings/server/publishers.js

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

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