relocated edit button
Merge pull request #220 from Webcraft-Myplanet/UF-370

UF-370
Merge pull request #221 from Webcraft-Myplanet/hotfix-1

Fix broken Project/Team Profile default Avatar
Merge branch 'master' into hotfix-1