fix
change resource base url
Merge branch 'master' into gh-pages