change location of images / update used paths
Merge remote-tracking branch 'origin/master' into Andrew