Nikesh & Toan | Added avatar for users
Fixed merge conflicts