Merge branch 'feature-jpa-implementation' of https://github.com/axlm/Entity into feature-jpa-implementation

* 'feature-jpa-implementation' of https://github.com/axlm/Entity:
  Refactored code as a result of an API change in Modifier.