Generate (H)OCR when ingesting a basic or large image.
Pass Solr parameters for Large Images, so highlighting can take place.
Merge branch '7.x' of github.com:discoverygarden/manidora into 7.x-image-ocr

Conflicts:
	manidora.module - Make the merge happen...