Clean after field rename for Student
Merge branch 'master' into student_id_number

Conflicts:
	archive/app/models/gaku/student_injector.rb
	sample/db/sample/gaku/changes/student_changes.rb