ant: Support API doc generation
Document new integration jobs layout (with OMERO.web results collection)
Add description for  breaking integration suite
ant: Correct apidoc output directory and remove debugging messages
Search.txt: Correct use of unicode quotes
Merge pull request #750 from rleigh-dundee/ant-props

ant: Set SOURCE_BRANCH and OMERO_RELEASE using omero.shortversion
Merge remote-tracking branch 'origin/develop' into ant-apisupport

Conflicts:
	common/rules.xml
merge develop -D org: PR 745 (OMERO.matlab improvements (rebased onto develop))
merge develop -D org: PR 752 (ant: Support API doc generation)
merge develop -D org: PR 754 (Document new integration jobs)
merge develop -D org: PR 755 (Search.txt: Correct use of unicode quotes)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs' (exclude comment)
Updating 522ccfa..44094aa
Merged PRs (fast-forward):
  # PR 750 rleigh-dundee 'ant: Set SOURCE_BRANCH and OMERO_RELEASE using omero.shortversion'

Merged PRs:
  # PR 745 sbesson 'OMERO.matlab improvements (rebased onto develop)'
  # PR 752 rleigh-dundee 'ant: Support API doc generation'
  # PR 754 sbesson 'Document new integration jobs'
  # PR 755 rleigh-dundee 'Search.txt: Correct use of unicode quotes'

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