Card 44 - Start of the importer
Card 44 - Importer functionality to save basic patient records into a database
Merge pull request #75 from SolidStateGroup/153-patient-contact

changes to conversation recipients retrieval
Card 44 - Importer functionality to save basic patient records into a database
Card 44 - Importer functionality adding properties for Dev
Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop

Conflicts:
	root/api/src/main/java/org/patientview/api/controller/ConversationController.java
	root/api/src/main/java/org/patientview/api/service/ConversationService.java
	root/api/src/main/java/org/patientview/api/service/impl/ConversationServiceImpl.java
	root/api/src/main/java/org/patientview/api/service/impl/UserServiceImpl.java
	root/data/pom.xml
	root/data/src/main/java/org/patientview/persistence/repository/UserRepository.java
	root/data/src/test/java/org/patientview/test/persistence/repository/UserRepositoryTest.java
Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop

Conflicts:
	root/api/src/main/java/org/patientview/api/controller/ConversationController.java
	root/api/src/main/java/org/patientview/api/service/ConversationService.java
	root/api/src/main/java/org/patientview/api/service/impl/ConversationServiceImpl.java
	root/api/src/main/java/org/patientview/api/service/impl/UserServiceImpl.java
	root/data/pom.xml
	root/data/src/main/java/org/patientview/persistence/repository/UserRepository.java
	root/data/src/test/java/org/patientview/test/persistence/repository/UserRepositoryTest.java
Merge pull request #76 from SolidStateGroup/44-xml-importer

44 xml importer
44 - importer maven config
Merge branch 'develop' into 153-patient-contact

Conflicts:
	root/api/src/main/resources/conf/local-api.properties