Merge pull request #1112 from mtbc/fix-auto-imports

Fix IDE auto-import entries. (rebase)
Add guice-2.0 as dependency
Handle >5 fileset thumbs with 'show all' See #10803
Basic MultiImageFilesetMoveTest
Fix IOOB when importing MIFs (see #10772)
Handle images with NO fileset
merge develop -D org -I include -E exclude: PR 1049 (Specification removal)
merge develop -D org -I include -E exclude: PR 1062 (Import log)
merge develop -D org -I include -E exclude: PR 1075 (Connection (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1080 (Re-raise javac.maxmem to 600m (Fix #10688))
merge develop -D org -I include -E exclude: PR 1092 (Fileset display)
merge develop -D org -I include -E exclude: PR 1093 (blitz: ExporterI no longer uses DOMUtil.writeXML)
merge develop -D org -I include -E exclude: PR 1096 (Thumbnail figure develop)
merge develop -D org -I include -E exclude: PR 1109 (fix #10671: make server handling of odd file paths more configurable)
merge develop -D org -I include -E exclude: PR 1113 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1115 (Review Java chgrp tests for MIF work (See #10777))
merge develop -D org -I include -E exclude: PR 1116 (Fix IOOB when importing MIFs (see #10772))
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 1049 rleigh-dundee 'Specification removal'
  # PR 1062 ximenesuk 'Import log'
  # PR 1075 jburel 'Connection (rebased onto develop)'
  # PR 1080 joshmoore 'Re-raise javac.maxmem to 600m (Fix #10688)'
  # PR 1092 will-moore 'Fileset display'
  # PR 1093 rleigh-dundee 'blitz: ExporterI no longer uses DOMUtil.writeXML'
  # PR 1096 will-moore 'Thumbnail figure develop'
  # PR 1109 mtbc 'fix #10671: make server handling of odd file paths more configurable'
  # PR 1113 snoopycrimecop 'Update develop submodules'
  # PR 1115 joshmoore 'Review Java chgrp tests for MIF work (See #10777)'
  # PR 1116 bpindelski 'Fix IOOB when importing MIFs (see #10772)'
Conflicting PRs (not included):
  # PR 972 knabar 'Repository API'

Repository: openmicroscopy/bioformats
Updating 2287f2d..aa5ad9c
Merged PRs:
  # PR 476 rleigh-dundee 'ZVI ROI fixes (develop)'
  # PR 482 rleigh-dundee 'Remove 2003fc and related classes'
  # PR 485 melissalinkert 'Fix export of multiple files (rebased onto develop)'
  # PR 491 melissalinkert 'Final 4.4.7 bug fixes (rebased onto develop)'

Repository: ome/scripts
Updating 46fba5e..9a3b42e
Merged PRs:
  # PR 30 will-moore 'OME-TIFF_Big_Images_10761_develop'

Repository: openmicroscopy/ome-documentation
Updating 12e5143..c1d72ce
Merged PRs:
  # PR 345 sbesson 'Review Matlab documentation (see #10389) (rebased onto develop)'

Generated by OMERO-merge-develop#250 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/250/)