Added first phase of untested support for running dynamic tests first then running static tests only if these pass
Resolved merge conflicts
Added auto-sorting of map to put .java files first
Greatly simplified running dynamic tests first (no longer need sorting), and wrote some unit tests
Tidied up Tester
Pre merge
Merged dynamicfirst with master