Merge branch 'master' into gh-pages
updates index
Merge branch 'master' into gh-pages
restore app index
Merge branch 'gh-pages'