merge dev_5_0 -D org: PR 918 (Update auto-generated properties)
merge dev_5_0 -D org: PR 921 ( DropBox configuration clarification)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 899 rleigh-dundee 'Cpp: Document building with cmake (dev_5_0)' (exclude comment)
Updating 8a94f48..7fea68e
Merged PRs (fast-forward):
  # PR 917 ximenesuk 'Import documentation tweaks'

Merged PRs:
  # PR 918 sbesson 'Update auto-generated properties'
  # PR 921 ximenesuk ' DropBox configuration clarification'

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