Mapping Converter Finished
clean a bit
Merge branch 'feature/r2rml' into develop
code cleaning