Merge branch 'gh-pages'
re-upload css/js
Merge branch 'master' into gh-pages