bs
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/roommeet/settings.pyc