Merge branch 'master' of https://github.com/jasli2/evolution
fix users view zh-CN
Merge branch 'master' of https://github.com/hutuxiansheng/evolution into hutuxiansheng-master