merge dev_5_0 -D org: PR 894 (Added documentation for Active Directory LDAP)
merge dev_5_0 -D org: PR 896 (Remove limitations)
merge dev_5_0 -D org: PR 900 (OMERO configuration properties)
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 10293bf..6ba46f8
Merged PRs (fast-forward):
  # PR 893 joshmoore 'Fine tune config'
  # PR 897 sbesson 'Update auto-generated properties'

Merged PRs:
  # PR 894 sbesson 'Added documentation for Active Directory LDAP'
  # PR 896 joshmoore 'Remove limitations'
  # PR 900 sbesson 'OMERO configuration properties'

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