Add methods for Approve Bid and filter bids based on status
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Areas/Procurement/Controllers/BidController.cs
	Web/Areas/Procurement/Views/Bid/Index.cshtml
modify Bid Controller
Add operation to display transporters bid plan informaiton in to bid.
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Services/Cats.Services.Procurement/ITransportBidPlanDetailService.cs
	Services/Cats.Services.Procurement/TransportBidPlanDetailService.cs
	Web/Cats.csproj
	Web/Views/Shared/_MainLayout.cshtml
	Web/Web.config
Merge branch 'master' of https://github.com/EdgeComputing/cats
Resolve Conflicts