team world map
Pivot works edits
Merge branch 'develop'