Merge pull request #1115 from aRn0D/target-entity-resolver

[ResourceBundle][Proposal] Target entity resolver
Fixing CS, adding phpdoc