Merge pull request #125 from SolidStateGroup/milestone-5

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