CATS-825 Modified BidPlan Controller &Service to add commodity amount &warehouse info
in to DB
Fix Delete Problem on bidPlan Index View
Merge branch 'master' of https://github.com/EdgeComputing/cats

Conflicts:
	Web/Web.config