updated image paths for github
Merge branch 'master' into gh-pages