merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 811 will-moore 'Webgateway mip 5150' (status: )
Updating c858dcf..fb7eaf8
Merged PRs (fast-forward):
  # PR 804 hflynn 'Adding example server setup page '
  # PR 808 sbesson 'Travis fix'

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