FMS-54 : remove constraints for category and visibility when merging incidents.
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet
FMS-12 : show correct list of reports when combining roles

Merge branch 'master' of https://github.com/CIRB/django-fixmystreet

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