Merge remote branch 'upstream/master' into fix-switch-racecondition

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

bigbluebutton-client/build.xml

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

...tton-client/resources/prod/bbb-deskshare-applet-0.8.1.jar

...nt/resources/prod/bbb-deskshare-applet-unsigned-0.8.1.jar

bigbluebutton-client/resources/prod/lib/bbb_deskshare.js

...ebutton-client/src/org/bigbluebutton/core/model/Config.as

...dules/deskshare/view/components/DesktopPublishWindow.mxml

.../modules/deskshare/view/components/DesktopViewWindow.mxml

...bluebutton/modules/present/ui/views/FileUploadWindow.mxml

bigbluebutton-config/bigbluebutton-release

bigbluebutton-config/web/index.html

bigbluebutton-config/web/testjava.html

bigbluebutton-web/grails-app/conf/bigbluebutton.properties

...a/org/bigbluebutton/deskshare/client/DeskShareApplet.java

...a/org/bigbluebutton/deskshare/client/DeskshareClient.java

...rg/bigbluebutton/deskshare/client/ScreenSharerRunner.java

deskshare/applet/test-applet.sh