2014/6/20
Merge branch 'master' of github.com:luofengmacheng/translation