Merge conflicts

bbb-screenshare/NOTES.md

bbb-screenshare/README.md

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

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

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

...nshare/app/src/main/webapp/WEB-INF/screenshare.properties

bbb-screenshare/jws/README.md

bbb-screenshare/jws/native-libs/unsigned-jars/README.md

...e/jws/native-libs/unsigned-jars/ffmpeg-3.0.2-1.2-svc2.jar

...enshare/jws/native-libs/unsigned-jars/sign-ffmpeg-svc2.sh

bbb-screenshare/jws/webstart/build.sh

...in/java/org/bigbluebutton/app/video/VideoApplication.java

bbb-video/src/main/webapp/WEB-INF/red5-web.xml

...uebutton-client/branding/default/style/css/BBBDefault.css

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/prod/BigBlueButton.html

bigbluebutton-client/resources/prod/lib/3rd-party.js

bigbluebutton-client/src/BigBlueButtonMainContainer.mxml

.../src/org/bigbluebutton/common/AccessibleNumericStepper.as

...nt/src/org/bigbluebutton/common/events/DragWindowEvent.as