CIT-703 modified Freight Charge calculation on Payment Request( to take minimum of Dispached and delivered amount)
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config