Merge remote-tracking branch 'origin/main'

# Conflicts:
#	accounts/templates/accounts/login.html
#	accounts/urls.py
#	templates/includes/navbar.html

Author: aleattene