Merge with upstream/master

BigBlueButton.html

Vagrantfile

akka-bbb-apps/.cache-main

akka-bbb-fsesl/.cache-main

bbb-common-message/.cache-main

bbb-common-message/.cache-tests

bigbluebutton-apps/.cache-main

bigbluebutton-apps/.cache-tests

bigbluebutton-client/libs/MonsterDebugger.swc

bigbluebutton-html5/.meteor/versions

bigbluebutton-html5/Gruntfile.js

bigbluebutton-html5/settings-development.json

bigbluebutton-html5/settings-production.json

bigbluebutton-web/bigbluebutton-web.eml

bigbluebutton-web/bigbluebutton-web.iml

bigbluebutton-web/bigbluebutton-web.ipr

bigbluebutton-web/bigbluebutton-web.iws

bigbluebutton-web/build.sh

clients/flash/ANE-AirCapabilities-master.zip

logging-server/bbb-client-logger