CampaignBidder quality consideration
contd
Merge branch 'master' of https://github.com/orsa/MLWS

Conflicts:
	AdX/adx-agnet/OrOmerShelly/Coordinator.java
	AdX/adx-agnet/lib/oosagent.jar