k
Merge remote-tracking branch 'origin/master'

Conflicts:
	auction/src/template/AuctionTemplate.java