Merge project E806 with master ... many conflicts, esp. in response_controller.rb
From grades_controller.rb, remove tests for if assignment.team_assignment?
Merge branch 'master' of https://github.com/expertiza/expertiza

Conflicts:
	app/models/score.rb
	db/schema.rb