changed json url to be relative
Merge branch 'master' into gh-pages