Fixed failing functional tests in groups_controller_test.rb
Merge pull request #1176 from danielstjules/fix-functional-tests

Fixed failing functional tests in groups_controller_test.rb
Merge branch 'issue-577' into redirects

Conflicts:
	app/views/graders/index.html.erb
Updated PR-981 to display a modal when the user performs an ajax call and the session has expired
Fix lib/tasks/simulator.rake
Merge pull request #1177 from danielstjules/redirects

Closes #577: Display modal on failed ajax calls from expired sessions
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
Merge pull request #1179 from danielstjules/issue-239

Issue 239: Cleanup Rake Tasks
Merge branch 'master' into pr/1153
Fix i18n_missing_keys.rake
Merge branch 'master' into pr/1153
mysql2 >= 0.3 required in gemfile as of Rails 3.1
Fix exception type mismatch in create_or_update_from_csv_row in rubric_criterion.rb
Fixed functional test cases for move_criterion