Merge branch 'develop' of github.com:SolidStateGroup/patientview into 127-join-request and also added count to messages

Conflicts:
	root/api/src/test/java/org/patientview/api/job/StatisticsTaskTest.java