Merge branch 'master' into voip-fix

bigbluebutton-client/.actionScriptProperties

bigbluebutton-client/.flexProperties

...rc/org/bigbluebutton/modules/present/views/Thumbnail.mxml

bigbluebutton-config/bin/bbb-conf

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

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

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

...message-recorder/src/main/java/org/bbb/EventListener.java

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

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