adding support for django directives
adding support for custom directive
replacing term by new property
Merge pull request #984 from aleksandra-tarkowska/django_derectives

adding support for django directives
merge develop -Dnone -Ibreaking -Eexclude -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 987 snoopycrimecop 'Update auto-generated properties' (user: snoopycrimecop)
  # PR 986 sbesson 'Document usage of new OMERO_SESSION_DIR envvar for the CLI' (user: sbesson)
  # PR 973 hflynn 'Team workflow doc' (user: hflynn)
Updating 01a91b2..6d5ff26
Previously merged:
  # PR 984 aleksandra-tarkowska 'adding support for django directives'

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