Merge remote-tracking branch 'origin'
treea7233fcc648060c1ccd0dc6a249e92067eb22e2a
-rw-r--r-- 47 .gitignore
-rw-r--r-- 2149 .mailmap
-rw-r--r-- 11819 DownsamplerTest.java
-rw-r--r-- 613 README
drwxr-xr-x - T2-NIT
drwxr-xr-x - T2-TreelineGraph
-rw-r--r-- 748 TODO
-rw-r--r-- 521 TODO.ElasticAlign
drwxr-xr-x - TrakEM2_
drwxr-xr-x - VectorString
-rwxr-xr-x 42 grep
drwxr-xr-x - mpicbg-trakem2
-rw-r--r-- 2895 pom.xml
drwxr-xr-x - test