entity changes
Merge pull request #186 from aptara/Sushil

entity changes
Merge pull request #187 from aptara/Sprint-5

Sprint 5