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: PR 239 (Developer Docs tidy)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating 50254df..34f05d8
Merged PRs:
  # PR 224 gusferguson 'Training material'
  # PR 239 hflynn 'Developer Docs tidy'
Conflicting PRs (not included):
  # PR 242 joshmoore 'Begin improving DSL section'

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