change before merged
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/bin/auction/client/view/BillFrame$1.class
	Client/bin/auction/client/view/BillFrame.class
	Client/src/auction/client/view/BillFrame.java