Temp
Merge branch 'master' of https://github.com/Vancy/AuctionDemo
fix minor bugs