remove unused FS readers config parameter
Merge pull request #1309 from jburel/mif-record-error

Log error
Merge pull request #1325 from mtbc/fs-lite

Improve FS parts of etc/omero.properties
Add generic function to create and upload objects in OMERO.matlab
Add utility functions to create projects and datasets
Add utility functions to create plates and screens
Reload objects when linking them to parents
Explicitly state loaded objects are returned in the header
Fix error message for unfound projects
Fix possible NPE when renaming tmp dir.
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 1322 (Matlab examples 3 (rebased onto develop))
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 1327 (OMERO.matlab: add object creation functions (see #10637) (rebased onto develop))
merge develop -D org -I include -E exclude: PR 1328 (Fix possible NPE)
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 1322 sbesson 'Matlab examples 3 (rebased onto develop)'
  # PR 1324 joshmoore 'Jython scripts (See #918)'
  # PR 1326 snoopycrimecop 'Update develop submodules'
  # PR 1327 sbesson 'OMERO.matlab: add object creation functions (see #10637) (rebased onto develop)'
  # PR 1328 jburel 'Fix possible NPE'

Repository: openmicroscopy/bioformats
Updating e7a6065..88783b1
Merged PRs:
  # PR 528 melissalinkert 'Tile performance improvements for VMS and NDPI'
  # PR 574 rleigh-dundee 'xsd-fu: Generalise language type mapping'
  # PR 578 rleigh-dundee 'xsd-fu: Generalise language type mapping (2)'
  # PR 583 melissalinkert 'Reduce the number of JAI ImageIO registrations'

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

Repository: openmicroscopy/ome-documentation
Updating 45aa1a0..1871d3f
Merged PRs:
  # PR 369 rleigh-dundee 'Cpp: Correct content and markup'
  # PR 404 gusferguson 'Updating Download screenshots for Version 5 (FS)'
  # PR 405 hflynn 'Troubleshooting rebase'
  # PR 406 mtbc 'Americanize spellings, fix typos, expand contractions (rebased)'

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