Fiexed NullPointer
Merge branch 'master' of https://github.com/healthteam/teamhealth