CIT-543 Added Dispatch Allocation on Logistics Dashboard
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config