adding support for django directives
adding support for custom directive
replacing term by new property
Merge pull request #975 from ximenesuk/upload-rm-doc-dev

Expose upload_rm option in the documentation
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 973 (Team workflow doc)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 984 (adding support for django directives)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating b0e3027..01a91b2
Previously merged:
  # PR 975 ximenesuk 'Expose upload_rm option in the documentation'

Merged PRs:
  # PR 973 hflynn 'Team workflow doc'
  # PR 984 aleksandra-tarkowska 'adding support for django directives'

Generated by OME-5.1-merge-push#447 (http://ci.openmicroscopy.org/job/OME-5.1-merge-push/447/)