gemfile
Merge branch 'master' of https://github.com/songgz/wizshop

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