Fixing jpa relations
Merge branch 'subscriptions' of github.com:callista-software/phk-patientdata-pump into subscriptions