Merge branch 'main' into circles-theme-tweaks

Conflicts:
	esp/esp/themes/theme_data/floaty/templates/main.html
	esp/esp/themes/urls.py
	esp/templates/sidebar/admin.html