Merge pull request #745 from corinnecurcie/stable

team page updated
map stuff updated