cit-417, cit-422
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
no message
no message
cit-
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Areas/Logistics/Views/Donation/AddNewDonationPlan.cshtml
	Web/Web.config