Merge pull request #107 from d3scomp/newgen-keznikl

Convoy demo + test, some bugfixes
Merge pull request #108 from d3scomp/newgen-keznikl

AnnotationProcessor convoy test update