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