Merge branch 'master' into issue-956. Completed enhancement for Issue 956, show rails and ruby version in About dialogue for admin users.
Fixed issue 97. Required fields are now indicated when creating or editing a grade entry form.
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Redirect user back to root_url if they timeout and make Ajax request
Merge branch 'master' of github.com:mike-stewart/Markus
Merge remote-tracking branch 'markus-upstream/master'
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Merge remote-tracking branch 'kira/issue894'
Merge branch 'master' of git://github.com/MarkUsProject/Markus
Adding required fields.
Grader tab UI complete.
added a new feature to grade entry forms that allows admins to control whether or not to render Total column
Complete Grader tab and associated functionality for Grade Entry view.
Add: rake task to run coverage tests
Add (PR: #1087): rake task to run coverage tests

In addition to #1087

 - use of `find`
 - use of -I'lib:test'
Merge pull request #41 from GhiGt/PR-1087

Add: rake task to run coverage tests
Merge branch 'master' of github.com:benjaminvialle/Markus into rcov
Merge branch 'master' of github.com:benjaminvialle/Markus into rcov
Merge branch 'master' of github.com:benjaminvialle/Markus into rcov
Added simplecov to test_helper