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
Merge pull request #1154 from danielstjules/issue-1035

Closes #1035: Implementation for "show total" property in grade entry form
Fix for 1152: Set include_root_in_json to false, and added tests to the API functional tests to ensure that the root isn't included in a response
Merge pull request #1158 from danielstjules/issue-1152

Closes #1152: Set include_root_in_json to false, and added API functional tests to check for root
Update api_wrapper.rb after changing JSON api output, fix http_status.json.erb to output valid json
Add assignments to api_wrapper
MarkusRESTfulAPI::Users.update now returns the updated user
Merge pull request #1160 from danielstjules/api_wrapper

Api wrapper
Added groups and submission downloads to api_wrapper
Merge pull request #1161 from danielstjules/api_wrapper

Added groups and submission downloads to api_wrapper
Fixed blog link in README
Merge pull request #1163 from gabrielluong/master

Fixed blog link in README