Add on_team? method to User
Merge branch 'master' into final