Merge pull request #1010 from umsmit32/test-framework

FIX for failing functional tests.
Adding marks from test scripts to the assignments.
Max marks for the assignments now include the marks from test scripts. Earned marks now include marks earned from test scripts.
Merge branch 'test-framework' of git://github.com/MarkUsProject/Markus into test-framework