merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 211 (Sysadmin docs tidy (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 213 (Tables documentation partial rewrite 9957 (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 214 (Fixed forward declartion incomplete type error in c++ example code (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating 2e32665..4716c77
Merged PRs:
  # PR 211 hflynn 'Sysadmin docs tidy (rebased onto develop)'
  # PR 213 manics 'Tables documentation partial rewrite 9957 (rebased onto develop)'
  # PR 214 jburel 'Fixed forward declartion incomplete type error in c++ example code (rebased onto develop)'

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