Merge branch anton with master for v2.0.masterv2.0
tree136443662246a040d6b942ebb64366cf5de13434
-rw-r--r-- 5 .gitignore
-rw-r--r-- 1927 build.xml
drwxr-xr-x - lib
drwxr-xr-x - maps
drwxr-xr-x - rapport
drwxr-xr-x - src
drwxr-xr-x - test