added user avatars
Merge branch 'add-user-avatars'
s
added user avatars