update for new format of resources.json
Merge branch 'master' into gh-pages