Added Changes to select Transfer Station in a Trip
Merge remote-tracking branch 'origin/CanIMakeItIntegrated' into CanIMakeItIntegrated