Merge pull request #6 from SenecaCDOT-BigBlueButton/bobert

Bobert
images were updated
conflict with images solved
Merge remote-tracking branch 'origin/master' into bobert
images deleted
conflict with images solved
Merge branch 'master' into bobert
Merge branch 'master' into bobert
Inviting and generating guests works
Merge branch 'bobert' of https://github.com/SenecaCDOT-BigBlueButton/SenecaBBB into bobert

Conflicts:
	web-app/build/classes/.gitignore