FIX: avatar was attached to the user who uploaded it...
Merge branch 'master' into share-view-fix