merge develop -D org: PR 864 (move %time% template expansion term to only user-owned (rebased from dev_5_0))
merge develop -D org: PR 865 (Added documentation for Active Directory LDAP)
merge develop -D org: PR 879 (Added warning about web plugins to upgrade docs)
merge develop -D org: PR 883 (Document client requirements for in-place import on Windows. (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating ce96fa7..e940940
Merged PRs (fast-forward):
  # PR 880 sbesson 'Release jobs redesign'
  # PR 878 sbesson 'Dco revert'
  # PR 874 mtbc 'add note about consequences of "damaging" in-place import files (rebased from dev_5_0)'
  # PR 882 sbesson 'OMERO.server properties: documentation template (rebased onto develop)'
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 869 joshmoore '12311 auto memory docs (rebased onto develop)'
  # PR 871 rleigh-dundee 'travis: Switch from raring to saucy'

Merged PRs:
  # PR 864 mtbc 'move %time% template expansion term to only user-owned (rebased from dev_5_0)'
  # PR 865 dpwrussell 'Added documentation for Active Directory LDAP'
  # PR 879 dpwrussell 'Added warning about web plugins to upgrade docs'
  # PR 883 bpindelski 'Document client requirements for in-place import on Windows. (rebased onto develop)'

Generated by OME-5.1-merge-push#337 (http://ci.openmicroscopy.org/job/OME-5.1-merge-push/337/)