- cleanup
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton