Merge branch 'user-management' into develop
Merge branch 'develop' of https://github.com/ubyssey/dispatch into develop

Conflicts:
	dispatch/dispatch/settings.py
	dispatch/dispatch/urls.py