updated json
Merge branch 'feature/jsonParser' into develop
updated json tempalte