new
using ceiling to calculate quorum
dev now stores email in files
fixing password reset error
making quorum report as an integer
admin site cleanup
Merge branch 'develop' of github.com:hef/ps1auth into develop

Conflicts:
	settings/local.py
merging migrations
Merge branch 'release/1.0.19'
Merge branch 'master' of github.com:hef/ps1auth