Add user avatar
Merge branch 'dev'