Merge branch 'master' into bruce_leo

Conflicts:
.gitignore
config/locales/cn.yml