fixbug show avatar
Merge branch 'fix_bugs_from_aminh'