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: PR 886 (DropBox note (rebased onto develop))
merge develop -D org: PR 887 (5.0.3: CLI documentation (rebased onto develop))
merge develop -D org: PR 888 (Expand setup.py test/py.test options description (rebased onto develop))
merge develop -D org: PR 889 (Update recommended PostgreSQL version to 9.2 for float bug fix)
merge develop -D org: PR 890 (New search docs (rebased onto develop))
merge develop -D org: PR 891 (Add travis_retry to sudo apt-get install commands in .travis.yml (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating e940940..474b070
Merged PRs (fast-forward):
  # PR 864 mtbc 'move %time% template expansion term to only user-owned (rebased from dev_5_0)'

Merged PRs:
  # 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)'
  # PR 886 ximenesuk 'DropBox note (rebased onto develop)'
  # PR 887 sbesson '5.0.3: CLI documentation (rebased onto develop)'
  # PR 888 sbesson 'Expand setup.py test/py.test options description (rebased onto develop)'
  # PR 889 rleigh-dundee 'Update recommended PostgreSQL version to 9.2 for float bug fix'
  # PR 890 joshmoore 'New search docs (rebased onto develop)'
  # PR 891 sbesson 'Add travis_retry to sudo apt-get install commands in .travis.yml (rebased onto develop)'

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