tour image collage fallback

if there aren't 10 tour images to fill out the collage, grab some item
images to fill it out
minor
Theme option: display subject links on browse
Merge remote-tracking branch 'upstream/master'