Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into webdriverio-setup

bigbluebutton-html5/.eslintignore

bigbluebutton-html5/.eslintrc.js

bigbluebutton-html5/.jscsrc

bigbluebutton-html5/.meteor/versions

bigbluebutton-html5/Gruntfile.js

bigbluebutton-html5/imports/api/audio/client/bridge/base.js

bigbluebutton-html5/imports/api/audio/client/bridge/sip.js

...luebutton-html5/imports/api/audio/client/manager/index.js

.../imports/api/breakouts/server/handlers/breakoutJoinURL.js

.../imports/api/breakouts/server/handlers/breakoutStarted.js

...orts/api/breakouts/server/handlers/updateTimeRemaining.js

...ml5/imports/api/breakouts/server/modifiers/addBreakout.js

.../imports/api/breakouts/server/modifiers/clearBreakouts.js

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

...l5/imports/api/captions/server/handlers/captionHistory.js

...mports/api/captions/server/handlers/captionOwnerUpdate.js

...ml5/imports/api/captions/server/handlers/captionUpdate.js

...html5/imports/api/captions/server/modifiers/addCaption.js

...l5/imports/api/captions/server/modifiers/clearCaptions.js

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