Some server updates
Merge branch 'master' of https://github.com/brendan-benting/NordicMedical