Activities json fix for 08e94b6
merge develop -D org: PR 1960 (Remove cut link 11882)
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 2160 (Warning dialog before deletion of linked images)
merge develop -D org: PR 2165 (Inplace file path)
merge develop -D org: PR 2177 (develop: Update upgrade check handling in OMERO.web)
merge develop -D org: PR 2182 (Read only flag)
merge develop -D org: PR 2188 (Close the RFS and kill the root session.)
merge develop -D org: PR 2189 (Bugfix: Weird behaviour after switching users)
merge develop -D org: PR 2192 (Check for duplicate pixels IDs when adding to list.)
merge develop -D org: PR 2194 (Css js cleanup)
merge develop -D org: PR 2195 (Minify media viewer only)
merge develop -D org: PR 2202 (Update develop submodules)
merge develop -D org: PR 2204 (Workaround for Java 7 bug)
merge develop -D org: PR 2207 (Implemented maximum file size limit for import)
merge develop -D org: PR 2210 (Webstart index template)
merge develop -D org: PR 2214 (Activities json fix for 08e94b6)
merge develop -D org

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  # PR 2191 mtbc 'fix #11663, #11664, #11877: SQL DOMAIN; import logs (rebased); FS delete log trigger' (label: breaking)
  # PR 2128 jburel 'Open with develop' (label: exclude)
  # PR 1385 manics 'Update the OMERO VirtualBox image' (exclude comment)
  # PR 2036 joshmoore 'DSL Map Type' (exclude comment)
Already up-to-date.

Merged PRs:
  # PR 1960 will-moore 'Remove cut link 11882'
  # PR 2127 dpwrussell 'Working view to email announcements to selected users, groups, email addresses and/or all users'
  # PR 2160 dominikl 'Warning dialog before deletion of linked images'
  # PR 2165 dominikl 'Inplace file path'
  # PR 2177 chris-allan 'develop: Update upgrade check handling in OMERO.web'
  # PR 2182 joshmoore 'Read only flag'
  # PR 2188 ximenesuk 'Close the RFS and kill the root session.'
  # PR 2189 dominikl 'Bugfix: Weird behaviour after switching users'
  # PR 2192 ximenesuk 'Check for duplicate pixels IDs when adding to list.'
  # PR 2194 aleksandra-tarkowska 'Css js cleanup'
  # PR 2195 aleksandra-tarkowska 'Minify media viewer only'
  # PR 2202 snoopycrimecop 'Update develop submodules'
  # PR 2204 dominikl 'Workaround for Java 7 bug'
  # PR 2207 dominikl 'Implemented maximum file size limit for import'
  # PR 2210 aleksandra-tarkowska 'Webstart index template'
  # PR 2214 will-moore 'Activities json fix for 08e94b6'

Repository: openmicroscopy/bioformats
Excluded PRs:
  # PR 1001 qidane 'New time docs and samples' (status: error)
  # PR 994 melissalinkert 'InCell: fix NPE when parsing Z positions (rebased onto develop)' (status: )
  # PR 978 berl 'Add writing of .v3draw format for easy loading with Vaa3D.' (user: berl)
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI' (label: exclude)
  # PR 1002 qidane 'Adding a Map type and MapAnnotation' (exclude comment)
  # PR 816 melissalinkert 'Add support for multi-channel Volocity Clipping datasets' (label: exclude)
Already up-to-date.

Merged PRs:
  # PR 857 melissalinkert 'Initial support for Zeiss .lms files'
  # PR 858 melissalinkert 'Initial support for Veeco AFM data'
  # PR 981 melissalinkert 'Ignore namespaces when filling in an XMLAnnotation's Value'
  # PR 983 melissalinkert 'Woolz: make sure the service is initialized when calling openBytes (rebased onto develop)'
  # PR 985 qidane 'Updating transform catalog for 2013-10-dev-1'
  # PR 990 melissalinkert 'Memoization fixes (rebased onto develop)'
  # PR 991 melissalinkert 'Only add a MetadataOnly element if no TiffData elements are present'
  # PR 992 rleigh-dundee 'C++: Enable stricter warnings'
  # PR 995 rleigh-dundee 'C++ sphinx documentation'
  # PR 999 melissalinkert 'Fix for single channel  meas_mode 13 data (rebased onto develop)'

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

Merged PRs:
  # PR 73 sbesson 'Fix scripts to comply with PEP8 1.5.0 (rebased onto develop)'

Repository: openmicroscopy/ome-documentation
Updating ee6a045..df2965f
Merged PRs (fast-forward):
  # PR 706 hflynn 'Update C++ job descriptions'

Merged PRs:
  # PR 626 pwalczysko 'Add new Squash tutorial and screenshots'
  # PR 707 hflynn 'Updates to sysadmin installation docs (rebased onto develop)'

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