refactored Config loader/getter
Merge branch 'master' into db-postgres
minor refactoring