tems, members
fix naming for teams and team_memberships
merge master
merged master
remove Gemfile.lock