E22

Added shapefile import of raster features and incidents. Implemented incident collapsing.