19 - Update merge rules + added accepted_at date
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet