Fixes following review.
Merge pull request #860 from mtbc/%time%-now-user-owned

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

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 863 sbesson 'OMERO.server properties: documentation template' (status: pending)
Updating 8004c06..53a820a
Merged PRs (fast-forward):
  # PR 860 mtbc 'move %time% template expansion term to only user-owned'

Merged PRs:
  # PR 862 ximenesuk 'DropBox note'
Generated by OMERO-5.0-merge-push#101 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-push/101/)