Updates to entity manager and its application.
Merge branch 'master' of https://github.com/ase-lab/ePlan-CommonFeatures-Development

Conflicts:
	asePlanTestScenarioGenerator/FakeEOCAdapter.cs