Added user avatars
Added avatars
Merge from remote