work for FMS-57
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet

Conflicts:
	django_fixmystreet/fixmystreet/fixtures/mail_templates.json
	django_fixmystreet/fixmystreet/models.py