Merge pull request #320 from melissalinkert/plugin-options

ImageJ plugin option improvements
Slidebook: use metadata lists in one more place
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 326 (Sprint 4 bug fixes (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 329 (Sort original metadata keys ending with an index)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 338 (Slidebook channel count (develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Updating 55cf7fd..2086a45
Merged PRs:
  # PR 326 joshmoore 'Sprint 4 bug fixes (rebased onto develop)'
  # PR 329 melissalinkert 'Sort original metadata keys ending with an index'
  # PR 338 melissalinkert 'Slidebook channel count (develop)'

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