Zh fayin

This branch is the result of merging the "master" to "pronunciations" branch. I only mannually modified two files, "config/locales/en.yml" and "app/view/layouts/v2/taxa.html.haml".