Merge pull request #892 from mtbc/make-sha1-optional

Avoid setting dummy values inappropriately for original files.
Fix selection of wells and grid synchronization.
Fix selection when key down.
Add method to check if valid well.
Improve handling of selected cells grid.
Add multi-selection to grid.
Select the row using the mouse clicked location.
merge develop -D org -I include -E exclude: PR 888 (Note java version info on imports.)
merge develop -D org -I include -E exclude: PR 898 (Bulk annotations for web image viewer, rebased onto develop)
merge develop -D org -I include -E exclude: PR 912 (Add Bio-Formats' turbojpeg artifact to the classpath)
merge develop -D org -I include -E exclude: PR 926 (OMERO.matlab: add raw data utility functions (see #10384) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 938 (Big image rnd (rebased onto develop))
merge develop -D org -I include -E exclude: PR 939 (Update Graph view when changing plane (see #10563) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 941 (.travis.yml (take 2) and test fixes)
merge develop -D org -I include -E exclude: PR 942 (Virtualbox fixes)
merge develop -D org -I include -E exclude: PR 945 (Handle null state on close in FileMaker (rebased onto develop))
merge develop -D org -I include -E exclude: PR 946 (Multi selection plate (rebased onto develop))
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 888 mtbc 'Note java version info on imports.'
  # PR 898 knabar 'Bulk annotations for web image viewer, rebased onto develop'
  # PR 912 melissalinkert 'Add Bio-Formats' turbojpeg artifact to the classpath'
  # PR 926 sbesson 'OMERO.matlab: add raw data utility functions (see #10384) (rebased onto develop)'
  # PR 938 jburel 'Big image rnd (rebased onto develop)'
  # PR 939 jburel 'Update Graph view when changing plane (see #10563) (rebased onto develop)'
  # PR 941 joshmoore '.travis.yml (take 2) and test fixes'
  # PR 942 sbesson 'Virtualbox fixes'
  # PR 945 joshmoore 'Handle null state on close in FileMaker (rebased onto develop)'
  # PR 946 jburel 'Multi selection plate (rebased onto develop)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 159 melissalinkert 'Improve .ndpi support'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 421 melissalinkert 'Documentation for new Imspector format'
  # PR 424 qidane 'Specification changes for 2013-06 release'
  # PR 430 melissalinkert 'Metamorph TIFF: only populate Plate metadata if there are multiple wells (rebased onto develop)'
  # PR 431 melissalinkert 'LZW: prevent reading beyond the end of the stream (rebased onto develop)'
Conflicting PRs (not included):
  # PR 427 rleigh-dundee 'xsd-fu: Generate sources at build time'

Repository: ome/scripts
Already up-to-date.

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Generated by SCC-merge#196 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/196/)