Changes for new look security

Conflicts:
	root/api/src/test/java/org/patientview/api/job/StatisticsTaskTest.java
Merge pull request #56 from SolidStateGroup/develop-ui

Develop ui
127 - Join Request changes for Trello
Refactor of test
Security Improvements

Conflicts:
	root/api/src/test/java/org/patientview/api/job/StatisticsTaskTest.java
127 - Join Request changes for Trello
Refactor of test
Security Improvements

Conflicts:
	root/api/src/test/java/org/patientview/api/job/StatisticsTaskTest.java
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 #57 from SolidStateGroup/127-join-requests

127 join requests
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...
Count functionality
Merge pull request #59 from SolidStateGroup/127-join-requests

Count functionality
Count functionality
Corrected filter box functionality
Corrected filter box functionality
Merge pull request #61 from SolidStateGroup/127-join-requests

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