Reset entites
Merge pull request #190 from aptara/Sushil

Reset entites
Merge pull request #191 from aptara/Sprint-5

Sprint 5