FMS 55 + unit test
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet

Conflicts:
	django_fixmystreet/fixmystreet/tests/mail.py