Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton

bbb-voice/.classpath

bbb-voice/.gitignore

bbb-voice/.settings/org.eclipse.wst.common.component

...e/.settings/org.eclipse.wst.common.project.facet.core.xml

bbb-voice/build/.gitignore

bbb-voice/lib/.gitignore

bigbluebutton-client/config/bigbluebutton.nginx

bigbluebutton-client/resources/bbb-deskshare-applet-0.64.jar

...java/org/bigbluebutton/deskshare/client/blocks/Block.java

labs/record-and-playback/message-producer/build.gradle

...layback/message-producer/src/main/java/org/bbb/Event.java

...ayback/message-producer/src/main/java/org/bbb/IEvent.java

...src/main/java/org/bbb/sender/IMessageGeneratorSender.java

.../src/main/java/org/bbb/sender/MessageGeneratorSender.java

...producer/src/main/java/org/bbb/servlets/XMLProcesser.java

...ack/message-producer/src/main/webapp/META-INF/context.xml

...e-producer/src/main/webapp/WEB-INF/applicationContext.xml

...playback/message-producer/src/main/webapp/WEB-INF/web.xml

...d-and-playback/message-producer/src/main/webapp/index.jsp

...nd-playback/message-producer/src/main/webapp/js/jquery.js