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 848 (Nginx doc (rebased onto dev_5_0))
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating db2db83..76ef6bf
Merged PRs (fast-forward):
  # PR 851 aleksandra-tarkowska 'adding HTTP response header (rebased onto dev_5_0)'
  # PR 844 hflynn 'Re-working OMERO sysadmin index page'
  # PR 847 hflynn 'Reformatting VA docs to make them less scary '
  # PR 842 sbesson 'Insert OMERO sidebar template after page TOC sidebar'

Merged PRs:
  # PR 819 joshmoore '12311 auto memory docs'
  # PR 836 mtbc 'Managed repository template path expansions'
  # PR 848 aleksandra-tarkowska 'Nginx doc (rebased onto dev_5_0)'
Generated by OMERO-5.0-merge-push#86 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-push/86/)