Rebase
No more JSF impl
No JSF, abstract entity + OnetoMany relationship