Change wording.
Merge pull request #731 from ximenesuk/dropbox-orphan

Clarify location and group for DropBox imports.
Merge pull request #730 from hflynn/in-place-update

Improvements to import scenarios
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating b2e513a..9e66a7a
Merged PRs (fast-forward):
  # PR 730 hflynn 'Improvements to import scenarios'
  # PR 731 ximenesuk 'Clarify location and group for DropBox imports.'

Generated by OMERO-5.0-merge-daily#629 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/629/)