Merge remote-tracking branch 'upstream/master' into slideControls

...on/freeswitch/voice/freeswitch/FreeswitchApplication.java

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

bigbluebutton-client/build.xml

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/BigBlueButton.html

...uebutton-client/resources/prod/help/CSS/bbb-bootstrap.css

bigbluebutton-client/resources/prod/help/CSS/bijou.min.css

bigbluebutton-client/resources/prod/help/CSS/css

...ebutton-client/resources/prod/help/CSS/diggdigg-style.css

...ources/prod/help/CSS/facebook-comments-hidewpcomments.css

...ent/resources/prod/help/CSS/facebook-comments-widgets.css

...utton-client/resources/prod/help/CSS/font-awesome.min.css

...uebutton-client/resources/prod/help/CSS/inlinestylesheet0

...tton-client/resources/prod/help/CSS/inlinestylesheetnum10

...utton-client/resources/prod/help/CSS/inlinestylesheetnum5

...utton-client/resources/prod/help/CSS/inlinestylesheetnum9

...uebutton-client/resources/prod/help/CSS/media-queries.css

bigbluebutton-client/resources/prod/help/CSS/prettyPhoto.css

bigbluebutton-client/resources/prod/help/CSS/shortcodes.css