Merge comp-deletion into develop

Merge branch that has logic for soft deleting components of a station once they are created.