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

Milestone 4 5
Merge branch 'develop' of github.com:SolidStateGroup/patientview into milestone-4-5
footer & nav layout issues