Merge pull request #973 from sbesson/rebased/develop/10582_loadOmero

loadOmero() improvements (rebased onto develop)
Merge pull request #977 from mtbc/overridden-spelling-dev

Correct spelling for "overridden". (rebase)
Merge pull request #968 from knabar/develop

Fix bug that causes _treeList to only return last directory entry
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 954 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 961 (Basic test of Blitz fileset methods. See #10613)
merge develop -D org -I include -E exclude: PR 969 (Split view 10094 develop)
merge develop -D org -I include -E exclude: PR 970 (Web bugs march25th develop)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 898 knabar 'Bulk annotations for web image viewer, rebased onto develop'
  # PR 912 melissalinkert 'Add Bio-Formats' turbojpeg artifact to the classpath'
  # PR 954 snoopycrimecop 'Update develop submodules'
  # PR 961 will-moore 'Basic test of Blitz fileset methods. See #10613'
  # PR 969 will-moore 'Split view 10094 develop'
  # PR 970 will-moore 'Web bugs march25th develop'

Repository: openmicroscopy/bioformats
Updating febaf15..f987684
Merged PRs:
  # PR 159 melissalinkert 'Improve .ndpi support'
  # PR 351 ctrueden 'Add SPW support to FakeReader'
  # PR 424 qidane 'Specification changes for 2013-06 release'
  # PR 435 melissalinkert 'Fixes for March 2013 bug week (rebased onto develop)'
  # PR 438 melissalinkert 'Fix the autogenerated metadata field counts (rebased onto develop)'
Conflicting PRs (not included):
  # PR 442 mtbc 'bump AssumeNG up from 1.2.3 to 1.2.4'

Repository: ome/scripts
Already up-to-date.
Merged PRs:
  # PR 23 will-moore 'Kymograph 8206_develop'

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

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