Add entities in persistence.xml
Merge branch 'master' of github.com:callista-software/phk-patientdata-pump

Conflicts:
	pump-service/src/main/resources/META-INF/persistence.xml
Merge branch 'master' of github.com:callista-software/phk-patientdata-pump