add team answer model
Merge branch 'master' into teams
Merge branch 'master' into teams
update rails and ruby, fix dependencies