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

Conflicts:
	Migrations/Cats.DatabaseSchema/dbo/Tables/Bid.sql
	Web/Cats.csproj