LB-1332 : Avatar overlaps on the default one is uploaded one is not square

Fixed
Conflict fix
Merge pull request #591 from nidzix/devel

LB-1332 : Avatar overlaps on the default one is uploaded one is not square