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

Conflicts:
	Web/Web.config
Fix: Update stock balance report after dispatch
Merge branch 'master' of https://github.com/EdgeComputing/cats.git
CIT-241 On transport requisition print out. specify No. Program, Commodity, and Month/Round
Fixed pull conflict in webconfig
ui last branch
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Areas/EarlyWarning/Views/NeedAssessment/Index.cshtml
	Web/Views/Shared/_MainMenu.cshtml
	Web/Web.config
Merge branch 'master' into UI

Conflicts:
	Web/Areas/EarlyWarning/Views/NeedAssessment/Index.cshtml
	Web/Views/Shared/_MainMenu.cshtml
	Web/Web.config