friends list stuff
Merge remote-tracking branch 'mike/master'