Testing demo
Merge remote-tracking branch 'origin/newgen' into newgen-keznikl
* convoy test
* a few bugfixes
failing test ignored (waits for AnnotationProcessor to be fixed)
Merge pull request #107 from d3scomp/newgen-keznikl

Convoy demo + test, some bugfixes