Fix up dependencies for JPA stuff and fix up database in testcase
Merge branch 'master' of github.com:infobelt/skye