merge develop -D org: PR 626 (Add new Squash tutorial and screenshots)
merge develop -D org: PR 724 (In-place documentation (rebased onto develop))
merge develop -D org: PR 727 (updating omeroweb console output (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 93dcbe7..2e7a27c
Merged PRs (fast-forward):
  # PR 720 aleksandra-tarkowska 'Session engine update (rebased onto develop)'
  # PR 725 hflynn 'Remove webstart limitation (rebased onto develop)'
  # PR 723 hflynn 'Updating Demo server availability for 5.0.x (rebased onto develop)'

Merged PRs:
  # PR 626 pwalczysko 'Add new Squash tutorial and screenshots'
  # PR 724 joshmoore 'In-place documentation (rebased onto develop)'
  # PR 727 aleksandra-tarkowska 'updating omeroweb console output (rebased onto develop)'
Conflicting PRs (not included):
  # PR 726 aleksandra-tarkowska 'Setting cache (rebased onto develop)'

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