merge dev_5_0 -D org: PR 819 (12311 auto memory docs)
merge dev_5_0 -D org: PR 820 (OMERO Developer doc tidying)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 821 hflynn 'Schema links' (status: error)
Updating c858dcf..cf9043c
Merged PRs (fast-forward):
  # PR 818 bpindelski 'Add LDAP error message explanation. (rebased onto dev_5_0)'
  # 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'

Merged PRs:
  # PR 819 joshmoore '12311 auto memory docs'
  # PR 820 hflynn 'OMERO Developer doc tidying'

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