Merge pull request #923 from sbesson/rebased/develop/omero_properties_2

OMERO configuration properties (rebased onto develop)
Merge pull request #925 from bpindelski/rebased/develop/foreground

Add documentation of server foregrounding. (rebased onto develop)
merge develop -D org: PR 898 (Cpp: Document building with cmake)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating e251b6c..6447b9c
Merged PRs (fast-forward):
  # PR 925 bpindelski 'Add documentation of server foregrounding. (rebased onto develop)'
  # PR 923 sbesson 'OMERO configuration properties (rebased onto develop)'

Merged PRs:
  # PR 898 rleigh-dundee 'Cpp: Document building with cmake'

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