Merge remote-tracking branch 'upstream/master'
Fix for location presentation
Show small thumbnails for each collection on photo show
Restore caching of metadata
Merge pull request #154 from robotmay/photo-show

Show small thumbnails for collections