Removed some strange comments
Changed so that the user has a team and not just a team id
Merge branch 'work'