Refactoring avatar
Merge pull request #195 from taiwen/user

Refactoring avatar