user-to-team upgrade script
Merge branch 'master' into team-quests