bug fixing
should not be any confilcts
Merge branch 'master' of http://github.com/Vancy/AuctionDemo