1.5
Merge branch 'master' of https://github.com/xiangqh/b2cshop.git