FIx the Json error
Merge branch 'work' of github.com:CAS-eResearch/TAO-Core into work