Converting Hibernate templates queries to JPA
Merge branch 'working'