Merge remote-tracking branch 'origin/develop' into user-menu-display
Add separator as suggested by gus.
Synchronize All groups and single group selection.
Unify selection and deselection of all users.
Make sure the user logged in is selected

Select the user when the Show all is de-selected.
Merge pull request #2114 from jburel/modify-port-develop

Fix switch user and change port.
Added success message and homogenised some names
Merge pull request #2125 from joshmoore/rebased/develop/final-inplace-fixes

Final in-place fixes (rebased onto develop)
Fix email settings check typo
merge develop -D org -I include -E exclude: PR 1956 (Login button)
merge develop -D org -I include -E exclude: PR 1960 (Remove cut link 11882)
merge develop -D org -I include -E exclude: PR 2005 (assist #11091: refactor server DB queries for hierarchy navigation)
merge develop -D org -I include -E exclude: PR 2072 (User menu display)
merge develop -D org -I include -E exclude: PR 2106 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 2113 (Remove user (rebased onto develop))
merge develop -D org -I include -E exclude: PR 2127 (Working view to email announcements to selected users, groups, email addresses and/or all users)
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2128 jburel 'Open with develop' (label: exclude)
  # PR 2036 joshmoore 'DSL Map Type' (exclude comment)
  # PR 1385 manics 'Update the OMERO VirtualBox image' (exclude comment)
  # PR 1742 aleksandra-tarkowska '11591 user ip' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 1956 jburel 'Login button'
  # PR 1960 will-moore 'Remove cut link 11882'
  # PR 2005 mtbc 'assist #11091: refactor server DB queries for hierarchy navigation'
  # PR 2072 jburel 'User menu display'
  # PR 2106 snoopycrimecop 'Update develop submodules'
  # PR 2113 jburel 'Remove user (rebased onto develop)'
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users'
Conflicting PRs (not included):
  # PR 2122 jburel 'Ij insight fixed develop'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 945 rleigh-dundee 'cpp: bioformats: Add MetadataMap class for original metadata' (status: error)
  # PR 944 melissalinkert 'Remaining renaming' (label: exclude)
  # PR 923 LeeKamentsky 'Patch for CellProfiler issue 1043 - Cellomics files with renamed filenames' (user: LeeKamentsky)
  # PR 881 qidane 'New wavelength' (label: exclude)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 859 melissalinkert 'Assorted metadata/tile parsing fixes'
Conflicting PRs (not included):
  # PR 942 hflynn 'Final BF doc updates for 5 release (rebased onto develop)'

Repository: ome/scripts
Updating 3e885a7..b78c468
Merged PRs (fast-forward):
  # PR 60 will-moore 'Kymograph_Analysis creates single csv. See #11909'

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

Merged PRs:
  # PR 626 pwalczysko 'Add new Squash tutorial and screenshots'

Generated by OMERO-5.1-merge-push#65 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/65/)