ant: Use ant-contrib jar directly
windows: Remove stray "JDK6"
Cpp: Remove Ice 3.3 reference
troubleshooting: Replace Ice 3.3 reference
developers: Refer to current ZeroC documentation
Merge pull request #761 from rleigh-dundee/ant-makewrap

Delegate all Makefile targets to ant
Merge pull request #759 from hflynn/rebased/develop/contributing-file

ticket 10030 fix - contributing file for docs repo (rebased onto develop)
merge develop -D org: PR 758 (Adding API doc links to OMERO docs front page (rebased onto develop))
merge develop -D org: PR 760 (Make Ice 3.4 the minimum supported version)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 766 rleigh-dundee 'ant: Default all properties and handle empty vars in conf.py' (status: pending)
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs' (exclude comment)
Updating be161c6..d5bcff5
Merged PRs (fast-forward):
  # PR 759 hflynn 'ticket 10030 fix - contributing file for docs repo (rebased onto develop)'
  # PR 761 rleigh-dundee 'Delegate all Makefile targets to ant'

Merged PRs:
  # PR 758 hflynn 'Adding API doc links to OMERO docs front page (rebased onto develop)'
  # PR 760 rleigh-dundee 'Make Ice 3.4 the minimum supported version'

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