edited static pages, auction items in table format, bid checks end of auction, etc
Merge branch 'beta-test-changes'

Conflicts:
	app/views/auction_items/_auction_item.html.erb