add the Tosca enricher and refined some logic
Merge branch 'develop' of https://github.com/tuwiendsg/SALSA into develop