Merge branch 'stagging'
fixbug show avatar when image not exist \n
update file .PO
remove fix code
Merge branch 'fix_bugs_from_aminh'