Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala

bbb-screenshare/app/deploy.sh

bbb-screenshare/app/jws/lib/ffmpeg-macosx-x86_64.jar

bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar

bbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar

bbb-screenshare/app/jws/lib/ffmpeg.jar

bbb-screenshare/app/jws/lib/javacpp.jar

bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar

bbb-screenshare/app/jws/lib/javacv.jar

bbb-screenshare/app/jws/screenshare.jnlp

bbb-screenshare/app/screenshare.jnlp

...bluebutton/app/screenshare/ScreenshareStreamListener.java

...rg/bigbluebutton/app/screenshare/red5/Red5AppAdapter.java

bbb-screenshare/jws/native-libs/.gitignore

...are/jws/native-libs/ffmpeg-linux-x86/ffmpeg-linux-x86.jar

...s/native-libs/ffmpeg-linux-x86_64/ffmpeg-linux-x86_64.jar

...native-libs/ffmpeg-macosx-x86_64/ffmpeg-macosx-x86_64.jar

bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/deploy.sh

bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/s.sh

...creenshare/jws/native-libs/ffmpeg-windows-x86/sign-jar.sh