can add friends and has a status.
Merge remote-tracking branch 'origin/master'