fixed friend/unfriend bug
Merge branch 'dev'

* dev:
  fixed friend/unfriend bug