merge dev_5_0 -D org: PR 774 (Custom web login 11961)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating 25ff911..d6dbce6
Merged PRs (fast-forward):
  # PR 775 rleigh-dundee 'build: Support JENKINS_JOB'
  # PR 773 rleigh-dundee 'make: Convert variables to ant properties'
  # PR 763 rleigh-dundee 'Deprecate Ice 3.3 and note its removal for 5.1'
  # PR 770 hflynn 'Adding pyramid generation data duplication warning to in-place import'
  # PR 765 hflynn 'Making API doc links point at release version'
  # PR 764 hflynn 'Rephrasing CONTRIBUTING re: branch for PRs'
  # PR 767 rleigh-dundee 'ant: Default all properties and handle empty vars in conf.py'
  # PR 762 rleigh-dundee 'Delegate all Makefile targets to ant'
  # PR 757 hflynn 'ticket 10030 fix - contributing file for docs repo'
  # PR 749 hflynn 'Adding API doc links to OMERO docs front page'

Merged PRs:
  # PR 774 will-moore 'Custom web login 11961'

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