change seckill page
Merge branch 'master' into beta
latest code
Merge branch 'master' into beta