merge develop -D org: PR 743 (Propose redesign of OMERO and Bio-Formats 5.0 CI jobs)
merge develop -D org: PR 799 (Linux walkthrough (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 0c54db6..0b47a1b
Merged PRs (fast-forward):
  # PR 802 snoopycrimecop 'Update index.txt'
  # PR 801 sbesson 'Add Edit on Github button (rebased onto develop)'

Merged PRs:
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs'
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'

Generated by OMERO-5.1-merge-push#244 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/244/)