find meetingId instead of description
muteMeBtn hides when locked, added text to the muteMeBtn
switched strings to locale strings, unlocked is now only shown to moderators
more conditions to rearchive
 - fix issue where we can't match voice user with web user when user's name has a dash
Updates to bbb-conf to detect older version of bbb-freeswitch package
 - cleanup
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 - simplify audio settings
 - turn on loopback when testing mic
 - Add button to test microphone
 - fix issue where the avatar window opens up when a user sharing webcam is ejected from the meeting
 - disable looback audio when opening mic settings
Updated bbb-conf to remove --setup-dev scripts.  The script now refers developers to the wiki for detailed steps.
Added check to bbb-conf --check for ensuring ffmpeg is installed
updated copyright on index.html to 2013
Updated comments in /etc/cron.daily/bigbluebutton
removed old button and new one works
Merge remote branch 'upstream/master' into imp-muteme-button
 - provide JS api to eject user