Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade

.travis.yml

.../bigbluebutton/core/domain/MeetingInactivityTracker.scala

...rc/main/scala/org/bigbluebutton/core/models/Users2x.scala

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala

...scala/org/bigbluebutton/core2/testdata/FakeTestData.scala

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

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

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

bbb-webhooks/.dockerignore

bbb-webhooks/config.js

bbb-webhooks/messageMapping.js

bbb-webhooks/userMapping.js

bbb-webhooks/web_hooks.js

bigbluebutton-config/bigbluebutton-release

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