Merge branch 'master' into develop
is_on_team scoped to current league
fix defense search
Merge branch 'develop'