display avatar next to user status
Merge branch 'avatar'