Conflicts: gracedb/models.py gracedb/urls.py gracedb/views.py manage.py templates/gracedb/event_detail.html