LIB001-441: Fixing search results with alignment for mimed
LIB001-441: Fixing mimed search results with thumbnails
Merge pull request #73 from ianthe/master

LIB001-441: Tidying up conflict mess