bugfix edit incident, remove del incident
Merge branch 'feature/remove_delete_incident' into staging