merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating c858dcf..1dc4197
Merged PRs (fast-forward):
  # PR 813 ximenesuk 'Update DropBox documentation'
  # PR 811 will-moore 'Webgateway mip 5150'
  # PR 815 manics 'Remove mapannotations'
  # PR 804 hflynn 'Adding example server setup page '
  # PR 808 sbesson 'Travis fix'

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