Merge pull request #325 from sbesson/rebased/develop/matlab_version

Return Bio-Formats version in bfCheckJavaPath() (rebased onto develop)
Merge pull request #305 from rleigh-dundee/lif-usercomment

LIFReader: Add User-Comment tags to the series metadata
merge develop --exclude conflict needs-fixes broken: PR 317 (Add support for Inveon data)
merge develop --exclude conflict needs-fixes broken: PR 319 (Add support for JPEG-2000 compression with code 34712)
merge develop --exclude conflict needs-fixes broken: PR 320 (ImageJ plugin option improvements)
merge develop --exclude conflict needs-fixes broken: PR 326 (Sprint 4 bug fixes (rebased onto develop))
merge develop --exclude conflict needs-fixes broken

Repository: openmicroscopy/bioformats
Updating 96c615b..d634ee8
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 326 joshmoore 'Sprint 4 bug fixes (rebased onto develop)'
Conflicting PRs (not included):
  # PR 329 melissalinkert 'Sort original metadata keys ending with an index'

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