not allow duplicate friend
Merge branch 'develop'