modify shipping
Merge branch 'master' of github.com:songgz/wizshop

Conflicts:
	config/locales/mongoid.zh-CN.yml
merged