Issue #301 - Remove code from Image and Link tiles
Merge remote branch 'upstream/master'
Merge pull request #307 from fulv/master

Issue 301 "Remove code from Image and Link tiles"