Four profiles: local, embedded idp-test and idp-demo
Merge branch 'master' of github.com:callista-software/phk-patientdata-pump

Conflicts:
	pump-service/pom.xml