refactors Discourse.Resolver
Merge pull request #1484 from velesin/resolver_refactoring

refactors Discourse.Resolver