FMS-56 : Show confirmation popup when changing privacy.
Don't allow edit when report is merged
FMS-54 : Filter to exclude merged reports
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet

Conflicts:
	django_fixmystreet/backoffice/templates/pro/reports/show.html