Merge branch 'bruce_leo'

Conflicts:
.gitignore
config/locales/cn.yml