Issues on CIT-172, CIT-245, CIT-271, CIT-237, CIT-229 are fixed
fixed conflicts in allocation page
Merge branch 'master' of https://github.com/EdgeComputing/cats
CIT-175 generate new transport order had issues which is fixednow
Merge branch 'master' of https://github.com/EdgeComputing/cats
Fixed a mock in transport order test
Merge branch 'master' of https://github.com/EdgeComputing/cats
Merge branch 'master' of https://github.com/EdgeComputing/cats
Merge branch 'master' of https://github.com/EdgeComputing/cats