add cropped avatar
Merge branch 'develop' into user_avatar