remove xml2json
fix
Merge develop into master