Use brew test command for displaying OMERO/Bio-Formats versions
Add OMERO.web config/startup using nginx to the Homebrew script
Merge pull request #2615 from sbesson/sphinx_api_improvements

Sphinx api improvements
Rename search result column name 'Object' -> 'Type'
Show Acquired and Imported dates in 2 columns
Batch annotate panel handles objects from different groups
'annotation' field includes file.name, file.contents etc
Use "pid" instead of "state" for checking service.

This fixes the situation where "state" would return "0"
as the return code for a started and stopped service (Ice 3.4).
"pid" returns "1" if the service isn't running.
Removed some unnecessary code
Merge pull request #2693 from will-moore/zoom_centering_12391

Mousewheel zoom centres on mouse location
Fix formatting issues
Copy lost text from ome-docs
Use literal block for FS template items
merge dev_5_0 -D org: PR 2726 (Preview fix)
merge dev_5_0 -D org: PR 2775 (Permissions Test Matlab : Whole Suite)
merge dev_5_0 -D org: PR 2785 (Initial Dockerfile for OMERO)
merge dev_5_0 -D org: PR 2793 (Matlab CZI job)
merge dev_5_0 -D org: PR 2798 (Adv gen config)
merge dev_5_0 -D org: PR 2801 (Update dev_5_0 submodules)
merge dev_5_0 -D org: PR 2802 (Lucene Query Builder Unification)