Overhauled Test Framework Config UI / Settings page
Use text field instead of number field, and closed off br tags
Merge branch 'test-framework' into configui
Add i18n strings for download error messages.
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 pull request #1037 from yc2lee/configui

test-framework: New Config UI / Settings Page
Merge pull request #1038 from umsmit32/test-framework

Test framework - Marking assignments
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