no 3 item tuple allowed in a choices list

…that’s why we should have tests…
Merge branch 'dev' of https://github.com/greenstreetsinitiative/checkin into dev

Conflicts:
	survey/models.py