Auction select screen added
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/Auction.js
	js/program.js