Merge pull request #782 from will-moore/rebased/develop/custom_web_login_11961

Custom web login 11961 (rebased onto develop)
Merge pull request #783 from mtbc/rebased/develop/template-path-ownership

document new // separator in omero.fs.repo.path (rebased from dev_5_0)
merge develop -D org: PR 743 (Propose redesign of OMERO and Bio-Formats 5.0 CI jobs)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 8d08899..0c54db6
Merged PRs (fast-forward):
  # PR 783 mtbc 'document new // separator in omero.fs.repo.path (rebased from dev_5_0)'
  # PR 782 will-moore 'Custom web login 11961 (rebased onto develop)'

Merged PRs:
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs'

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