Ignoring backup files
Merge branch 'master' of git@github.com:EEXCESS/privacy-proxy.git
Added JsonXMLDataFormat
Merge branch 'master' of git@github.com:EEXCESS/privacy-proxy.git