Fixed conflicts from last master merge
Merge pull request #24 from Local-Care-Package/lesliet

Fixed conflicts from last master merge