merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 218 (Make the copyright date the current year (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken: PR 220 (Continuous integration (rebased onto develop))
merge develop -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating dd7e4e5..1363092
Merged PRs:
  # PR 218 bpindelski 'Make the copyright date the current year (rebased onto develop)'
  # PR 220 sbesson 'Continuous integration (rebased onto develop)'

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