add some friend
Merge branch 'master' into client
sasas