added a new feature to grade entry forms that allows admins to control whether or not to render Total column
Updated show total with internationalization
Fix failing functional test
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
fix download_groupings_files not working for TAs
Merge pull request #1157 from GhiGt/download-broken

fix download_groupings_files not working for TAs
Merge pull request #1154 from danielstjules/issue-1035

Closes #1035: Implementation for "show total" property in grade entry form
Merge branch 'master' of github.com:benjaminvialle/Markus into rcov