Finished changes discussed last meeting.
Merge branch 'master' of github.com:SenecaCDOT-BigBlueButton/SenecaBBB