Merge pull request #11 from SolidStateGroup/112-account-settings

112 account settings
174 - Changed for the enums introduced
Merge pull request #12 from SolidStateGroup/174-security-permission

174 - Changed for the enums introduced
Changed env settings
Merge remote-tracking branch 'origin/develop' into develop
Roll our own filter
FE changes and style updates
Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop-ui
Edit panel update
Merge pull request #13 from SolidStateGroup/develop-ui

Develop ui
174RYO - Added security filter. Needs adding to a delegating proxy filter
Merge pull request #14 from SolidStateGroup/174RYO-secuirty-permissions

174 ryo secuirty permissions
174RYO - Added security filter. Needs adding to a delegating proxy filter
174RYO - Reworking of Route Links
Fix for CORS on filter
174 - Fixed menus up for patient staff
Merge branch 'develop' of github.com:SolidStateGroup/patientview into ryp-security

Conflicts:
	root/api/src/main/java/org/patientview/api/filter/AuthenticateTokenFilter.java
Merge pull request #15 from SolidStateGroup/174RYP-security-permissions

174 ryp security permissions
Messages page template & styles
Merge branch 'develop' of github.com:SolidStateGroup/patientview into develop-ui

Conflicts:
	root/webapp/dist/views/main.html