xml2json Services configuration files completed
Merge branch 'Octopussy-2.0' of https://github.com/sebthebert/Octopussy into Octopussy-2.0