Fixes and stuff
Updates
Merge branch 'master' of https://github.com/pulsarhealthcare/spotlight_ipad