Merge pull request #134 from SolidStateGroup/milestone-6

Milestone 6
Card #275: order staff/patient roles, group type, code standard etc
Merge remote-tracking branch 'origin/develop' into develop
Merge pull request #135 from SolidStateGroup/milestone-6

Milestone 6
Merge branch 'develop' of github.com:SolidStateGroup/patientview into milestone-6