Generate %model_to_edit_type in Controller::Role::Annotation using %ENTITIES/entities_with
Merge branch 'annotation-role-entities' into beta

* annotation-role-entities:
  Generate %model_to_edit_type in Controller::Role::Annotation using %ENTITIES/entities_with