Added ANT testrunner
Begun MAVEN testrunner integration
Fixed merge conflict, added maven test runner integration