new
Merge branch 'develop' of github.com:hef/ps1auth into develop

Conflicts:
	settings/local.py