avatarPanel added in projectfile
rebasing conflicts