Add DFKI integration bundles
merge from conflict resolution
Delete metadata file from target directory
Merge branch 'master' of https://github.com/cegerard/appsGate-server