Merge branch 'ATE-issue-16' of github.com:JeremyMerkur/Markus into ATE-issue-8
WIP: refactored automated tester view so that the controller isn't inlining html into javascript into the onclick of a function. Modified routes to handle the new automated_tests_controller method to handle that. Modified Gemfile.lock so that libxml-ruby is version 2.6.0 so that it's compatabile with OSX 10.9 Mavericks.
Fixed minor bug involving trying to remove multiple tests at the same time (bug was introduced by refactoring).
Merge branch 'test-framework' of github.com:JeremyMerkur/Markus into ATE-issue-8
Merge branch 'test-framework' of github.com:JeremyMerkur/Markus into ATE-issue-8
WIP. Refactored Test-Framework lecturer/TA interface to use Ajax, modified tests such that they are a collection of file. TODO: write tests for new code, check UI for errors, fix stuff, etc...
WIP. Added the ability to download the assorted testing files, modified the test runner and the test process to have a cleaner testing environment, added some simple tests for the test_helper model, minor UI improvements. TODO: merge in updates to test-framework branch.
Test-Framework: added some helper text, updated UI slightly, modified testrunner.rb to have a file overwrite hierarchy (script/helper overwrites support overwrites student code).
Merged with test-framework, fixed UI conflicts, fixed broken unit tests, fixed a couple errors caught by unit tests.
Merge pull request #37 from JeremyMerkur/ATE-issue-8

ATE-issue-8 solved and merged.