Some sorting for controllers initial changes for join requests - includes merge with dev
66 Initial functionality for the admin join request screen
66 Initial functionality for the admin join request screen
Added AbstractService to group class
Merge pull request #33 from SolidStateGroup/66-join-request-admin

66 join request admin
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
Merge pull request #34 from SolidStateGroup/abstract-service-fix

Added AbstractService to group class
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
Fix for dummy field in migration
Merge pull request #35 from SolidStateGroup/abstract-service-fix

Abstract service fix
Merge branch 'develop' into 168-messaging
Fix for deleted entity annotation
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' into 168-messaging
Card #168 - model, service, controller, tests updated for conversations/messages backend, initial UI, updated database structure