Replaced the early placeholderimages with more proper ones.
Merge branch 'feature'