got rid of everything except web assets
Merge branch 'master' into gh-pages