add edit thro json
Merge branch 'master' into gh-pages
add edit thro json