Refactored the entitiesManager code.
Merge branch 'master' of https://github.com/ase-lab/ePlan-CommonFeatures-Development