merge develop -D org: PR 898 (Cpp: Document building with cmake)
merge develop -D org: PR 922 (Import documentation tweaks (rebased onto develop))
merge develop -D org: PR 923 (OMERO configuration properties (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating d3ad928..84d4b20
Merged PRs (fast-forward):
  # PR 914 dpwrussell 'Documentation for network hopping for developer laptops'

Merged PRs:
  # PR 898 rleigh-dundee 'Cpp: Document building with cmake'
  # PR 922 ximenesuk 'Import documentation tweaks (rebased onto develop)'
  # PR 923 sbesson 'OMERO configuration properties (rebased onto develop)'

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