merge dev_5_0 -D org: PR 819 (12311 auto memory docs)
merge dev_5_0 -D org: PR 836 (Managed repository template path expansions)
merge dev_5_0 -D org: PR 842 (Insert OMERO sidebar template after page TOC sidebar)
merge dev_5_0 -D org: PR 844 (Re-working OMERO sysadmin index page)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating 38a5537..db2db83
Merged PRs (fast-forward):
  # PR 839 mtbc 'clarify OMERO groups for LDAP-using sysadmins'

Merged PRs:
  # PR 819 joshmoore '12311 auto memory docs'
  # PR 836 mtbc 'Managed repository template path expansions'
  # PR 842 sbesson 'Insert OMERO sidebar template after page TOC sidebar'
  # PR 844 hflynn 'Re-working OMERO sysadmin index page'
Generated by OMERO-5.0-merge-push#83 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-push/83/)