Moved nconf out of base scope
Merge branch 'development'