Refactored genrate transport order.
Fixed conflicts for pull merge
Merge branch 'master' of https://github.com/EdgeComputing/cats