use ting agency to get pickupagencies
resolving merge conflicts
Merge branch 'develop' into feature/1122_bogbus
merge conflicts