Add avatar to users
Fix users controller
Merge
Sticker fixes