Completely remove proxy.html that reapeared
Merge branch 'master' into gh-pages