Images, tombstones, some temporary collision tweaking
Merge branch 'develop'