Merge branch 'master' into test-framework

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/api/test_results_controller.rb
	app/controllers/assignments_controller.rb
	app/controllers/automated_tests_controller.rb
	app/controllers/submissions_controller.rb
	app/helpers/automated_tests_helper.rb
	app/helpers/submissions_helper.rb
	app/models/assignment.rb
	app/models/result.rb
	app/models/submission.rb
	app/models/test_file.rb
	app/models/test_result.rb
	app/views/assignments/render_test_result.html.erb
	app/views/assignments/student_interface.html.erb
	app/views/automated_tests/_test_file.html.erb
	app/views/results/view_marks.html.erb
	db/schema.rb
	test/functional/api/test_results_controller_test.rb
	test/functional/automated_tests_controller_test.rb
	test/functional/flexible_criteria_controller_test.rb
	test/unit/assignment_test.rb
	test/unit/helpers/automated_tests_helper_test.rb
	test/unit/test_file_test.rb
	test/unit/test_result_test.rb