adding name to team squad and avatar
conflict merged
Merge branch 'haggucan-master'