Merge branch 'apps/main' into apps/session

Conflicts:
	scspace/scspace/urls.py