Merge pull request #136 from SolidStateGroup/milestone-6

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