RFQ
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Migrations/Cats.DatabaseSchema/Cats.DatabaseSchema.sqlproj
	Migrations/Cats.DatabaseSchema/Procurement/Tables/BidDetail.sql
	Migrations/Cats.DatabaseSchema/Security/Procurement.sql
	Migrations/Cats.DatabaseSchema/dbo/Tables/Bid.sql
	Web/Areas/Procurement/Controllers/BidController.cs