Merge branch '31-a-non-admin-user-must-not-be-able-to-delete-a-service-order-a-resource-from-the-respective-lists' into 'develop'

Resolve "A non-admin user must not be able to delete a Service Order and a Resource from the respective lists"

See merge request !26