Merge branch 'friendSongList'
commit xcuserstate