Report now serializable and file names are fixed
merge fixes
sorted merge conflicts
Merge branch 'master' of github.com:kls2510/UROPTestingSystem