Merge pull request #1346 from manics/rebased/develop/image_object_id_extension-11022

Web image object id extension 11022 (rebased onto develop)
Merge pull request #1348 from melissalinkert/network-fix-develop

Use the reflected network check on non-Linux platforms (rebased onto develop)
Add new OMERO.matlab function to update an original file with new content
Update WriteData example to illustrate new updateOriginalFile function
Add wrapper function to update a file annotation with new content

updateFileAnnotation() allows the user to update the file content of an
existing annotation. Optionally, the description and the namespace of the file
annotations can be updated as well using parameter/value pairs.
Update WriteData example to use the new update function
merge develop -D org -I include -E exclude: PR 991 (Add support for Ice 3.5 (develop))
merge develop -D org -I include -E exclude: PR 1132 (Repository API)
merge develop -D org -I include -E exclude: PR 1324 (Jython scripts (See #918))
merge develop -D org -I include -E exclude: PR 1326 (Update develop submodules)
merge develop -D org -I include -E exclude: PR 1342 (Python code examples and scripts for Paris develop)
merge develop -D org -I include -E exclude: PR 1350 (OMERO.matlab: add functions to update file annotations (rebased onto develop))
merge develop -D org -I include -E exclude

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 991 rleigh-dundee 'Add support for Ice 3.5 (develop)'
  # PR 1132 knabar 'Repository API'
  # PR 1324 joshmoore 'Jython scripts (See #918)'
  # PR 1326 snoopycrimecop 'Update develop submodules'
  # PR 1342 will-moore 'Python code examples and scripts for Paris develop'
  # PR 1350 sbesson 'OMERO.matlab: add functions to update file annotations (rebased onto develop)'

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 556 bpindelski 'Add ``mkfake`` tool'

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

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 404 gusferguson 'Updating Download screenshots for Version 5 (FS)'
  # PR 422 hflynn 'Fixes from ticket 11223 (rebased onto develop)'

Generated by OMERO-merge-develop#354 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/354/)