Merge branch 'develop' of github.com:SolidStateGroup/patientview into milestone-6
ie bugs
+ icon settings
+ help shifting
Merge pull request #135 from SolidStateGroup/milestone-6

Milestone 6