completed
Merge branch 'check_friends_update'