Final changes to collusion detection
Final changes to collusion detection
Some refactoring
Merge branch 'master' into Vaibhav's collusion detection branch

Conflicts:
	app/models/assignment_participant.rb
	app/views/grades/view_my_scores.html.erb
	app/views/student_task/view.html.erb