Nightly update
Big time screw up.  Will try to sort this out
Merge branch 'master' of github.com:aelster/CBI-Auction

Conflicts:
	_notes/dwsync.xml