Merge pull request #340 from melissalinkert/rebased/develop/schema-links

Use better schema documentation links (rebased onto develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 344 (Sprint4.2 bug fixes develop)
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/bioformats
Already up-to-date.
Merged PRs:
  # PR 344 melissalinkert 'Sprint4.2 bug fixes develop'

Generated by OMERO-merge-develop#120 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-develop/120/)