Merge remote-tracking branch 'origin/master'
all data in friend list
user nickname
days in user top list