merge dev_5_0 -D org: PR 860 (move %time% template expansion term to only user-owned)
merge dev_5_0 -D org: PR 862 (DropBox note)
merge dev_5_0 -D org: PR 863 (OMERO.server properties: documentation template)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating db2db83..8004c06
Merged PRs (fast-forward):
  # PR 852 hflynn 'Tidy Upgrade page incl. Paris requests for 5.0.3'
  # PR 819 joshmoore '12311 auto memory docs'
  # PR 853 sbesson 'Document orphaned datasets/plates retrieval via getProjects/getScreens'
  # PR 855 aleksandra-tarkowska 'Session engine (rebased onto dev_5_0)'
  # PR 836 mtbc 'Managed repository template path expansions'
  # PR 848 aleksandra-tarkowska 'Nginx doc (rebased onto dev_5_0)'
  # 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 860 mtbc 'move %time% template expansion term to only user-owned'
  # PR 862 ximenesuk 'DropBox note'
  # PR 863 sbesson 'OMERO.server properties: documentation template'
Generated by OMERO-5.0-merge-push#99 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-push/99/)