add avatar
Merge branch 'feature_avatar' into develop

* feature_avatar:
  add avatar