Merge branch 'develop' of github.com:SolidStateGroup/patientview into 127-join-requests

Conflicts:
	root/api/src/main/java/org/patientview/api/service/impl/GroupServiceImpl.java
	root/api/src/test/java/org/patientview/api/service/GroupServiceTest.java
	root/data/src/test/java/org/patientview/test/persistence/repository/NewsItemRepositoryTest.java
Merge pull request #58 from SolidStateGroup/127-join-requests

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