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

Repository: openmicroscopy/bioformats
Already up-to-date.
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 438 melissalinkert 'Fix the autogenerated metadata field counts (rebased onto develop)'
  # PR 439 melissalinkert 'Add support for Aperio AFI data'
  # PR 440 hinerm 'Fixed scifio-tools pom.xml'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 305 mtbc 'Add recommended shebang line to conf.py (rebase)'
  # PR 306 sbesson 'Allow to build documentation offline (rebased onto develop)'
  # PR 308 bpindelski 'Remove the _tools folder (rebased onto develop)'
  # PR 309 sbesson 'Walkthrough fixes (rebased onto develop)'

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