Merge remote-tracking branch 'origin/master'
additional data for friend list