Fixed build.xml to run tests, fixed run-tests
Merge branch 'master' of github.com:/AppStateESS/phpwebsite