Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Merge branch 'master', remote-tracking branch 'origin/master'
Merge branch 'master', remote-tracking branch 'origin/master' into dev
Team.find(id).name fix