Merge pull request #116 from SolidStateGroup/milestone-4-5

Milestone 4 5
News fix
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of github.com:SolidStateGroup/patientview into milestone-4-5