Refactor EntityResolver
Replace dual context by a single abstract context
Merge pull request #8 from PedroTroller/fix/refactoring

Refactor EntityResolver