added libs to test-classpath
fix ant paths for travis
re-ordered tests in ant
Merge remote-tracking branch 'upstream/master'