merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 224 (Training material)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Already up-to-date.
Merged PRs:
  # PR 224 gusferguson 'Training material'

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