merge dev_5_0 -D org: PR 779 (Webstart template)
merge dev_5_0 -D org: PR 781 (ldap over ssl instruction improvement)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 779 aleksandra-tarkowska 'Webstart template'
  # PR 781 aleksandra-tarkowska 'ldap over ssl instruction improvement'

Generated by OMERO-5.0-merge-daily#673 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/673/)