Fix concflicts with branch 'issue-1035'

Conflicts:
	app/views/grade_entry_forms/_grades_table.html.erb
	app/views/grade_entry_forms/_grades_table_column_names.html.erb
	db/schema.rb
	test/functional/grade_entry_forms_controller_test.rb