Fix merge confilcts
Add status filter on map
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet

Conflicts:
	django_fixmystreet/backoffice/tests/groups.py
	django_fixmystreet/backoffice/views/groups.py
	django_fixmystreet/backoffice/views/users.py
	django_fixmystreet/fixmystreet/migrations/0020_auto__add_userorganisationmembership__add_field_historicalorganisation.py
	django_fixmystreet/fixmystreet/models.py
	django_fixmystreet/fixmystreet/static/js/fixmystreetmap.js
	django_fixmystreet/fixmystreet/tests/mail.py
	setup.py
43: Filter for status on map
52;53;54: Merge reports (questions about constraints still exist)
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet

Conflicts:
	django_fixmystreet/backoffice/templates/pro/reports/show.html
	django_fixmystreet/backoffice/urls.py
	django_fixmystreet/backoffice/views/ajax.py
	django_fixmystreet/backoffice/views/reports/main.py
52: Add mail template to fixtures
43: Show filters on list page only
Update merge test case
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet