Fixing manifest/webapp implementation
Merge branch 'master' into gh-pages