added Entities
merged
Merge branch 'nthomas' of
https://github.com/SystemsInMotion/PetRescue-Core.git into nthomas