Merge Nick's test framework settings page updated into my repo
Add code to have unlimited tokens for an assignment.
The tokens aren't used anywhere yet, but when they are, this should be used to
make unlimited tokens.
Merge branch 'test-framework' of git://github.com/MarkUsProject/Markus into student-tests
Student requested test runs.
This commit adds an interface for students to run and recieve results from the automated testing framework.
Adding french language strings with placeholders
Merge branch 'test-framework' into student-tests

Conflicts:
	config/locales/en.yml
	config/locales/fr.yml
Add an error if test scripts don't run and change back some stuff I didn't intend to commit.
Stuff got added to the vendor folder for some reason. Let's get rid of it.
Merge branch 'tokens' into student-tests

Conflicts:
	app/helpers/submissions_helper.rb
	config/locales/en.yml
	config/locales/fr.yml
	public/javascripts/create_assignment.js
Add unlimited tokens to student testing
Some cleanup for stuff leftoever from testing that I missed
Applied Benjamin's locale changes
Merge pull request #1 from danielstjules/student-tests

Applied Benjamin's locale changes
Merge pull request #1071 from umsmit32/student-tests

Student requested tests