resolver config
Merge branch 'master' of github.com:emfcamp/emfnoc
Merge branch 'master' of github.com:emfcamp/emfnoc