Updated friends list to have default profile pictures. (Sam N, John K)
Merge remote-tracking branch 'origin/master'