Refactoring avatar
Merge pull request #194 from taiwen/user

Refactoring avatar