Merge pull request #850 from hflynn/rebased/develop/sysadmin-reorg

Re-working OMERO sysadmin index page (rebased onto develop)
Merge pull request #846 from hflynn/rebased/develop/sidebartoc_order

Insert OMERO sidebar template after page TOC sidebar (rebased onto develop)
Merge pull request #849 from hflynn/rebased/develop/VM-doc

Reformatting VA docs to make them less scary  (rebased onto develop)
merge develop -D org: PR 799 (Linux walkthrough (rebased onto develop))
merge develop -D org: PR 824 (OME DCO)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 191511b..ce9ffbe
Merged PRs (fast-forward):
  # PR 849 hflynn 'Reformatting VA docs to make them less scary  (rebased onto develop)'
  # PR 846 hflynn 'Insert OMERO sidebar template after page TOC sidebar (rebased onto develop)'
  # PR 850 hflynn 'Re-working OMERO sysadmin index page (rebased onto develop)'
  # PR 843 aleksandra-tarkowska 'adding HTTP response header'
  # PR 845 manics 'Clarify fastcgi (rebased onto develop)'
  # PR 827 aleksandra-tarkowska 'Nginx doc'

Merged PRs:
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 824 sbesson 'OME DCO'Conflicting PRs (not included):
  # PR 834 aleksandra-tarkowska 'Session engine'
Generated by OMERO-5.1-merge-push#321 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/321/)