converting trash collection to 'has a' path and cleaning up twpath.h
Merge branch 'sdev' into develop