add all the has_and_belongs_to_many relations
fix the TeamUserJoinTable
Merge branch 'clean'