Merging dev before moving repository

Nico Vermaasrequested to merge
esap-gateway-dev into master

Merging Nico's dev branch before moving repository to the SDC location.

Merge request reports