setup framework for detecting auction end
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
more framework for auction ending
Merge remote-tracking branch 'origin/master'
Send email on auction end WIP
Merge remote-tracking branch 'origin/master'

Conflicts:
	OnlineAuction/WebContent/WEB-INF/AdminItems.jsp