fix asset path
Merge branch 'gh-pages', remote-tracking branch 'origin/master' into gh-pages