ant: Correct property defaults
Java.txt: Correct indentation
windows: Ice 3.5 is not officially supported yet
Merge pull request #767 from rleigh-dundee/ant-propertydefaults-dev50

ant: Default all properties and handle empty vars in conf.py
Merge pull request #764 from hflynn/CONTRIB-update

Rephrasing CONTRIBUTING re: branch for PRs
Merge pull request #765 from hflynn/release-api-links

Making API doc links point at release version
Adding pyramid gen. warning to in-place import
merge dev_5_0 -D org: PR 763 (Deprecate Ice 3.3 and note its removal for 5.1)
merge dev_5_0 -D org: PR 770 (Adding pyramid generation data duplication warning to in-place import)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating 25ff911..cc74050
Merged PRs (fast-forward):
  # 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 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'

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