adding openjpa dependency
switching back to openjpa
Merge remote-tracking branch 'origin/master'