Team Import/Export enhancements
Merge pull request #945 from Fuzzysqurl/teambuilder

Team Import/Export enhancements