re #848 - A district can have an email address in case officers don't have unique email addresses
Merge branch 'master' into feature/848-email

Conflicts:
	application/admin/component/districts/view/district/templates/default.html.php
Merge branch 'feature/848-email'