r2 commits
r2 commits
bug fixed
resolve merge conflicts
commit r2 before merging with master branch
agian
master commits
confilicts sloved
Merge branch 'master' of github.com:lijiang3800045/test into r2_contacts