fix json editor
merge
Merge branch 'pveliberty-master'