merge develop -D org: PR 733 (Clarify location and group for DropBox imports. (rebased))
merge develop -D org: PR 734 (Improvements to import scenarios (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 803da1a..6c60e92
Merged PRs (fast-forward):
  # PR 729 sbesson 'Add page for Consortium CI jobs'

Merged PRs:
  # PR 733 ximenesuk 'Clarify location and group for DropBox imports. (rebased)'
  # PR 734 hflynn 'Improvements to import scenarios (rebased onto develop)'

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