Modified WebConfigFile
CATS-914 Modified BidController and Service to allow more than 1 active bids
CATS-909 Bid Administration page Refactoring
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config