Merge pull request #573 from joshmoore/rebased/develop/figure-scripts

Figure scripts (rebased onto develop)
Fix slice docs in Repositories.ice
merge develop --exclude conflict needs-fixes broken: PR 556 (FS-lite file security)
merge develop --exclude conflict needs-fixes broken: PR 577 (9821 Major FS refactoring)
merge develop --exclude conflict needs-fixes broken

Repository: openmicroscopy/openmicroscopy
Already up-to-date.
Merged PRs:
  # PR 556 joshmoore 'FS-lite file security'
  # PR 577 joshmoore '9821 Major FS refactoring'

Repository: openmicroscopy/bioformats
Updating 96c615b..bf12f46
Merged PRs:
  # PR 317 melissalinkert 'Add support for Inveon data'
  # PR 319 melissalinkert 'Add support for JPEG-2000 compression with code 34712'
  # PR 320 melissalinkert 'ImageJ plugin option improvements'
  # PR 325 sbesson 'Return Bio-Formats version in bfCheckJavaPath() (rebased onto develop)'
  # PR 326 joshmoore 'Sprint 4 bug fixes (rebased onto develop)'

Repository: ome/scripts
Updating 457e85a..272c83a

Repository: openmicroscopy/ome-documentation
Updating 2e32665..bc8e28f

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