Merge branch 'master' into jay-chen
friend requet functionality
Merge branch 'jay-chen'