Changing lables for 0.81
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
Minor update to bbb-conf
Merge remote branch 'upstream/master'