manifest.json readme
manifest.json readme
Merge branch 'master' into gh-pages