Changed to django form.
Merge remote-tracking branch 'origin'

Conflicts:
	geoincentives/forms.py