made image paths relative
Merge branch 'master' into ws-direct