work on the external authentication branch
adding ads
small fix to show unread messages as bold
pre merge update
Merge branch 'master' into ads

Conflicts:
	main/server/views_refactored.py
more work on ads
more work on ads
style changes
small changes
work on external authentication
more work on external authentication
more testing features
Merge branch 'master' into ads
Merge branch 'external-auth' into ads
more work on ads
stash
merged master
work on ads
finalizing ad delivery system
editing verbiage