Translate image URLs into images
Merge branch 'imgrelay' into development