Merge branch 'master' into chende
增加标记联系人收藏字段
Merge branch 'master' into chende
更改联系人收藏字段