merge develop -D org: PR 898 (Cpp: Document building with cmake)
merge develop -D org: PR 914 (Documentation for network hopping for developer laptops)
merge develop -D org: PR 915 (Deprecate omero_client.jar. (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 8f81cf5..08a33dd
Merged PRs (fast-forward):
  # PR 883 bpindelski 'Document client requirements for in-place import on Windows. (rebased onto develop)'
  # PR 913 sbesson 'Add switch-group info to user CLI page (rebased onto develop)'

Merged PRs:
  # PR 898 rleigh-dundee 'Cpp: Document building with cmake'
  # PR 914 dpwrussell 'Documentation for network hopping for developer laptops'
  # PR 915 bpindelski 'Deprecate omero_client.jar. (rebased onto develop)'

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