Merge pull request #2426 from dominikl/delete_user_bug

Bugfix: Prevent user/group deletion
Update develop submodules

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

Repository: openmicroscopy/bioformats
Updating f247b30..9d07147
Merged PRs (fast-forward):
  # PR 1075 hflynn 'Remove dead bitmap link (rebased onto develop)'
  # PR 1076 hflynn 'Adding CONTRIBUTING file to BF repo (rebased onto develop)'
  # PR 1073 rleigh-dundee 'docs: Delegate all sphinx Makefile targets to ant'

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

Repository: openmicroscopy/ome-documentation
Updating be161c6..309d0cf
Merged PRs (fast-forward):
  # PR 771 hflynn 'Adding pyramid generation data duplication warning to in-place import (rebased onto develop)'
  # PR 760 rleigh-dundee 'Make Ice 3.4 the minimum supported version'
  # PR 768 hflynn 'Rephrasing CONTRIBUTING re: branch for PRs (rebased onto develop)'
  # PR 769 hflynn 'Making API doc links point at release version (rebased onto develop)'
  # PR 766 rleigh-dundee 'ant: Default all properties and handle empty vars in conf.py'
  # PR 758 hflynn 'Adding API doc links to OMERO docs front page (rebased onto develop)'
  # PR 759 hflynn 'ticket 10030 fix - contributing file for docs repo (rebased onto develop)'
  # PR 761 rleigh-dundee 'Delegate all Makefile targets to ant'

Generated by OMERO-5.1-latest-submods#97 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-submods/97/)
Merge pull request #2430 from will-moore/PR2310_backport

Allow 'Cut' instead of 'Copy' when orphaned Dataset selected
Merge pull request #2471 from jburel/rebased/develop/cut-menu-tb

Cut menu tb (rebased onto develop)
Remove date from tooltip
Fix drag handle in IE8
Merge pull request #2467 from MicronOxford/dev/micron/omeropy/add-script-type-getters

omero.scripts.Type: add getter for name attr.
merge develop -D org: PR 2127 (Working view to email announcements to selected users, groups, email addresses and/or all users)
merge develop -D org: PR 2256 (Tablet drag handling)
merge develop -D org: PR 2258 (Truncate js tree dynamically 12161)
merge develop -D org: PR 2269 (ROI improvements)
merge develop -D org: PR 2336 (New tagging dialog)
merge develop -D org: PR 2357 (Generate Python API reference with Sphinx)
merge develop -D org: PR 2362 (Remove .jy from script names)
merge develop -D org: PR 2391 (Imagej omero (rebased onto develop))
merge develop -D org: PR 2403 (Send email)
merge develop -D org: PR 2411 (Update develop submodules)
merge develop -D org: PR 2428 (Move kill session to global teardown)
merge develop -D org: PR 2435 (cpp: RTypesI: use static locals in place of duplicated globals)
merge develop -D org: PR 2444 (CPP unit test fixes)