Fix for dummy on static data and merged with Dev

Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop

Conflicts:
	root/api/src/main/java/org/patientview/api/service/JoinRequestService.java
	root/api/src/main/java/org/patientview/api/service/impl/JoinRequestServiceImpl.java