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

* 'feature-jpa-implementation' of https://github.com/axlm/Entity: