Merge branch 'gh-pages'
Removed from proto, clashed with multiple instances, fixed eventListener refresh
Merge branch 'master' into gh-pages