Fix avatars
Merge branch 'develop'