Fix team manager
Merge branch 'master' into dev
Fix refresh method