Merge pull request #2139 from jburel/user-display-dev_5_0

User Menu Display dev 5 0
Merge pull request #2116 from dominikl/inplace-import-icon-dev_5_0

Inplace import icon dev 5 0, 11970
merge dev_5_0 -D org: PR 2086 (Record PersistentEventLogLoader event ID to file (see #11948))
merge dev_5_0 -D org: PR 2108 (release-src includes bioformats version metadata)
merge dev_5_0 -D org: PR 2124 (Update dev_5_0 submodules)
merge dev_5_0 -D org: PR 2133 (Renamed Cut,Copy,Paste,Unlink options (see trac #11880))
merge dev_5_0 -D org: PR 2134 (Unify command-line importer help)
merge dev_5_0 -D org: PR 2147 (Auto-updating copyright date via Django. See #11937 (rebased onto dev_5_0))
merge dev_5_0 -D org

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

Merged PRs:
  # PR 2086 jballanc 'Record PersistentEventLogLoader event ID to file (see #11948)'
  # PR 2108 rleigh-dundee 'release-src includes bioformats version metadata'
  # PR 2124 snoopycrimecop 'Update dev_5_0 submodules'
  # PR 2133 dominikl 'Renamed Cut,Copy,Paste,Unlink options (see trac #11880)'
  # PR 2134 sbesson 'Unify command-line importer help'
  # PR 2147 will-moore 'Auto-updating copyright date via Django. See #11937 (rebased onto dev_5_0)'

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

Merged PRs:
  # PR 915 imunro 'Fix for single channel  meas_mode 13 data.'
  # PR 941 melissalinkert 'Fix the download URL for stable release jars'
  # PR 946 melissalinkert 'Read internal pyramids from CellSens .vsi data'
  # PR 951 ctrueden 'Fix up Bio-Formats POMs'
  # PR 952 melissalinkert 'Memoization fixes'
  # PR 957 melissalinkert 'Correctly set Modulo annotations for multi-Image datasets (rebased onto dev_5_0)'
  # PR 958 melissalinkert 'Flex: be more permissive in parsing IFDs and XML (rebased onto dev_5_0)'
  # PR 960 melissalinkert 'Cache OME-XML between ImagePluses (rebased onto dev_5_0)'

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

Repository: openmicroscopy/ome-documentation
Updating 7550df1..046baa2
Merged PRs (fast-forward):
  # PR 678 bpindelski 'Update OMERO.grid doc'

Merged PRs:
  # PR 679 hflynn 'Suggested mailing list note update'

Generated by OMERO-5.0-merge-daily#600 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/600/)