Testing git on Eclipse
Merge branch 'JPA'