Merge branch 'e806' of git://github.com/akofink/expertiza into akofink-e806

Conflicts:
	Gemfile.lock
	app/controllers/grades_controller.rb
	app/controllers/response_controller.rb
	app/models/assignment.rb
	app/models/assignment_participant.rb
	app/models/assignment_team.rb
	app/models/automated_metareview/plagiarism_check.rb
	app/views/student_review/_responses.html.erb
	config/routes.rb
	db/schema.rb