merge develop -D org: PR 626 (Add new Squash tutorial and screenshots)
merge develop -D org: PR 729 (Add page for Consortium CI jobs)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 2e7a27c..803da1a
Merged PRs (fast-forward):
  # PR 724 joshmoore 'In-place documentation (rebased onto develop)'
  # PR 728 joshmoore '5.0.1 upgrade additions. (rebased onto develop)'
  # PR 727 aleksandra-tarkowska 'updating omeroweb console output (rebased onto develop)'
  # PR 726 aleksandra-tarkowska 'Setting cache (rebased onto develop)'

Merged PRs:
  # PR 626 pwalczysko 'Add new Squash tutorial and screenshots'
  # PR 729 sbesson 'Add page for Consortium CI jobs'

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