conflict and kendo grid maintainance
update on hub allocation controller
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Areas/Logistics/Controllers/HubAllocationController.cs
	Web/Areas/Logistics/Views/HubAllocation/AssignHub.cshtml
	Web/Areas/Procurement/Views/RFQ/Details.cshtml
	Web/Views/Shared/_MainLayout.cshtml
	Web/Web.config