Use a different variable for the entity type on the details tab
Replace entity_type() macro with get_entity_type() so entity_type can be used as a variable
Stash entity_type from Controller::Role::Load
Use new entity_type variable in templates
Remove old entitytype variable from Controller::Role::Annotation
Use entity_properties to get the URL-form of the entity type
Merge remote-tracking branch 'nikki-bitbucket/move-entitytype' into beta

* nikki-bitbucket/move-entitytype:
  Use entity_properties to get the URL-form of the entity type
  Remove old entitytype variable from Controller::Role::Annotation
  Use new entity_type variable in templates
  Stash entity_type from Controller::Role::Load
  Replace entity_type() macro with get_entity_type() so entity_type can be used as a variable
  Use a different variable for the entity type on the details tab