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
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.
Complete Grader tab and associated functionality for Grade Entry view.
fix some tasks

- added markus namespaces
- resolved some problems linked to assignment's building.
- added '!' to save method to see when it doesn't work.
Fix lib/tasks/simulator.rake
Merge master, resolve conflicts

Conflicts:
	app/controllers/grade_entry_forms_controller.rb
	app/helpers/grade_entry_forms_pagination_helper.rb
	app/views/assignments/edit.html.erb
	config/routes.rb
	db/schema.rb
Cleanup marks_graders and add functional tests
Cleaned up marks_graders views a bit, removed unused routes and dialog files
Add additional functional tests to marks_graders_controller_test.rb
Update marks_graders to use shared/flash_message
Merge pull request #1178 from danielstjules/grade_entry

Closes #49: Creates a Grader tab in the Grade Entry view, allowing instructors to assign TAs to students on a many-to-many basis. Includes searching, sorting, CSV upload/download, and implements the new permissions in the Grade Entry table.
Merge master, fix conflicts