Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update

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

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/prod/BigBlueButton.html

...tton/modules/screenshare/managers/PublishWindowManager.as

...button/modules/screenshare/managers/ScreenshareManager.as

...screenshare/view/components/ScreensharePublishWindow.mxml

...on-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as

bigbluebutton-config/bin/bbb-conf

bigbluebutton-config/cron.daily/bigbluebutton

bigbluebutton-html5/.meteor/.finished-upgraders

bigbluebutton-html5/.meteor/packages

bigbluebutton-html5/.meteor/release

bigbluebutton-html5/.meteor/versions

...omponents/presentation/presentation-toolbar/component.jsx

bigbluebutton-html5/package.json

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