merge dev_5_0 -D org: PR 1018 (Flex: fix support for new file naming scheme)
merge dev_5_0 -D org: PR 1061 (Fix 5D Imspector support)
merge dev_5_0 -D org: PR 1067 (Allow for a >1 count increment in B&H .sdt Files.)
merge dev_5_0 -D org: PR 1077 (CellSens: fix off-by-ones in subresolution tile calculations)
merge dev_5_0 -D org

Repository: openmicroscopy/bioformats
Updating c799e87..001c8a5
Merged PRs (fast-forward):
  # PR 1072 hflynn 'Adding CONTRIBUTING file to BF repo'
  # PR 1074 rleigh-dundee 'docs: Delegate all sphinx Makefile targets to ant'
  # PR 1071 hflynn 'Remove dead bitmap link'

Merged PRs:
  # PR 1018 melissalinkert 'Flex: fix support for new file naming scheme'
  # PR 1061 melissalinkert 'Fix 5D Imspector support'
  # PR 1067 imunro 'Allow for a >1 count increment in B&H .sdt Files.'
  # PR 1077 melissalinkert 'CellSens: fix off-by-ones in subresolution tile calculations'
Conflicting PRs (not included):
  # PR 1078 melissalinkert 'Lots of Zeiss CZI fixes'

Generated by OMERO-5.0-merge-daily#650 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/650/)