Change-Id: Iebcb576128887b84855a8d87b743243240a5b0b9
Merge branch 'master' of https://github.com/hijakke/jd-auction.git